logging = Optional.empty();
+
public Builder environment(Environment environment) {
this.environment = environment;
return this;
@@ -143,6 +161,14 @@ public Builder httpClient(OkHttpClient httpClient) {
return this;
}
+ /**
+ * Configure logging for the SDK. Silent by default — no log output unless explicitly configured.
+ */
+ public Builder logging(LogConfig logging) {
+ this.logging = Optional.of(logging);
+ return this;
+ }
+
public ClientOptions build() {
OkHttpClient.Builder httpClientBuilder =
this.httpClient != null ? this.httpClient.newBuilder() : new OkHttpClient.Builder();
@@ -162,10 +188,20 @@ public ClientOptions build() {
.addInterceptor(new RetryInterceptor(this.maxRetries));
}
+ Logger logger = Logger.from(this.logging);
+ httpClientBuilder.addInterceptor(new LoggingInterceptor(logger));
+
this.httpClient = httpClientBuilder.build();
this.timeout = Optional.of(httpClient.callTimeoutMillis() / 1000);
- return new ClientOptions(environment, headers, headerSuppliers, httpClient, this.timeout.get());
+ return new ClientOptions(
+ environment,
+ headers,
+ headerSuppliers,
+ httpClient,
+ this.timeout.get(),
+ this.maxRetries,
+ this.logging);
}
/**
@@ -176,6 +212,10 @@ public static Builder from(ClientOptions clientOptions) {
builder.environment = clientOptions.environment();
builder.timeout = Optional.of(clientOptions.timeout(null));
builder.httpClient = clientOptions.httpClient();
+ builder.headers.putAll(clientOptions.headers);
+ builder.headerSuppliers.putAll(clientOptions.headerSuppliers);
+ builder.maxRetries = clientOptions.maxRetries();
+ builder.logging = clientOptions.logging();
return builder;
}
}
diff --git a/src/main/java/com/schematic/api/core/ConsoleLogger.java b/src/main/java/com/schematic/api/core/ConsoleLogger.java
new file mode 100644
index 0000000..89a22b6
--- /dev/null
+++ b/src/main/java/com/schematic/api/core/ConsoleLogger.java
@@ -0,0 +1,51 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.schematic.api.core;
+
+import java.util.logging.Level;
+
+/**
+ * Default logger implementation that writes to the console using {@link java.util.logging.Logger}.
+ *
+ * Uses the "fern" logger name with a simple format of "LEVEL - message".
+ */
+public final class ConsoleLogger implements ILogger {
+
+ private static final java.util.logging.Logger logger = java.util.logging.Logger.getLogger("fern");
+
+ static {
+ if (logger.getHandlers().length == 0) {
+ java.util.logging.ConsoleHandler handler = new java.util.logging.ConsoleHandler();
+ handler.setFormatter(new java.util.logging.SimpleFormatter() {
+ @Override
+ public String format(java.util.logging.LogRecord record) {
+ return record.getLevel() + " - " + record.getMessage() + System.lineSeparator();
+ }
+ });
+ logger.addHandler(handler);
+ logger.setUseParentHandlers(false);
+ logger.setLevel(Level.ALL);
+ }
+ }
+
+ @Override
+ public void debug(String message) {
+ logger.log(Level.FINE, message);
+ }
+
+ @Override
+ public void info(String message) {
+ logger.log(Level.INFO, message);
+ }
+
+ @Override
+ public void warn(String message) {
+ logger.log(Level.WARNING, message);
+ }
+
+ @Override
+ public void error(String message) {
+ logger.log(Level.SEVERE, message);
+ }
+}
diff --git a/src/main/java/com/schematic/api/core/DoubleSerializer.java b/src/main/java/com/schematic/api/core/DoubleSerializer.java
new file mode 100644
index 0000000..2b47145
--- /dev/null
+++ b/src/main/java/com/schematic/api/core/DoubleSerializer.java
@@ -0,0 +1,43 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.schematic.api.core;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import java.io.IOException;
+
+/**
+ * Custom serializer that writes integer-valued doubles without a decimal point.
+ * For example, {@code 24000.0} is serialized as {@code 24000} instead of {@code 24000.0}.
+ * Non-integer values like {@code 3.14} are serialized normally.
+ */
+class DoubleSerializer extends JsonSerializer {
+ private static final SimpleModule MODULE;
+
+ static {
+ MODULE = new SimpleModule()
+ .addSerializer(Double.class, new DoubleSerializer())
+ .addSerializer(double.class, new DoubleSerializer());
+ }
+
+ /**
+ * Gets a module wrapping this serializer as an adapter for the Jackson ObjectMapper.
+ *
+ * @return A {@link SimpleModule} to be plugged onto Jackson ObjectMapper.
+ */
+ public static SimpleModule getModule() {
+ return MODULE;
+ }
+
+ @Override
+ public void serialize(Double value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+ if (value != null && value == Math.floor(value) && !Double.isInfinite(value) && !Double.isNaN(value)) {
+ gen.writeNumber(value.longValue());
+ } else {
+ gen.writeNumber(value);
+ }
+ }
+}
diff --git a/src/main/java/com/schematic/api/core/ILogger.java b/src/main/java/com/schematic/api/core/ILogger.java
new file mode 100644
index 0000000..b206f54
--- /dev/null
+++ b/src/main/java/com/schematic/api/core/ILogger.java
@@ -0,0 +1,38 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.schematic.api.core;
+
+/**
+ * Interface for custom logger implementations.
+ *
+ * Implement this interface to provide a custom logging backend for the SDK.
+ * The SDK will call the appropriate method based on the log level.
+ *
+ *
Example:
+ *
{@code
+ * public class MyCustomLogger implements ILogger {
+ * public void debug(String message) {
+ * System.out.println("[DBG] " + message);
+ * }
+ * public void info(String message) {
+ * System.out.println("[INF] " + message);
+ * }
+ * public void warn(String message) {
+ * System.out.println("[WRN] " + message);
+ * }
+ * public void error(String message) {
+ * System.out.println("[ERR] " + message);
+ * }
+ * }
+ * }
+ */
+public interface ILogger {
+ void debug(String message);
+
+ void info(String message);
+
+ void warn(String message);
+
+ void error(String message);
+}
diff --git a/src/main/java/com/schematic/api/core/LogConfig.java b/src/main/java/com/schematic/api/core/LogConfig.java
new file mode 100644
index 0000000..64f39bd
--- /dev/null
+++ b/src/main/java/com/schematic/api/core/LogConfig.java
@@ -0,0 +1,98 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.schematic.api.core;
+
+/**
+ * Configuration for SDK logging.
+ *
+ * Use the builder to configure logging behavior:
+ *
{@code
+ * LogConfig config = LogConfig.builder()
+ * .level(LogLevel.DEBUG)
+ * .silent(false)
+ * .build();
+ * }
+ *
+ * Or with a custom logger:
+ *
{@code
+ * LogConfig config = LogConfig.builder()
+ * .level(LogLevel.DEBUG)
+ * .logger(new MyCustomLogger())
+ * .silent(false)
+ * .build();
+ * }
+ *
+ * Defaults:
+ *
+ * - {@code level} — {@link LogLevel#INFO}
+ * - {@code logger} — {@link ConsoleLogger} (writes to stderr via java.util.logging)
+ * - {@code silent} — {@code true} (no output unless explicitly enabled)
+ *
+ */
+public final class LogConfig {
+
+ private final LogLevel level;
+ private final ILogger logger;
+ private final boolean silent;
+
+ private LogConfig(LogLevel level, ILogger logger, boolean silent) {
+ this.level = level;
+ this.logger = logger;
+ this.silent = silent;
+ }
+
+ public LogLevel level() {
+ return level;
+ }
+
+ public ILogger logger() {
+ return logger;
+ }
+
+ public boolean silent() {
+ return silent;
+ }
+
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ public static final class Builder {
+ private LogLevel level = LogLevel.INFO;
+ private ILogger logger = new ConsoleLogger();
+ private boolean silent = true;
+
+ private Builder() {}
+
+ /**
+ * Set the minimum log level. Only messages at this level or above will be logged.
+ * Defaults to {@link LogLevel#INFO}.
+ */
+ public Builder level(LogLevel level) {
+ this.level = level;
+ return this;
+ }
+
+ /**
+ * Set a custom logger implementation. Defaults to {@link ConsoleLogger}.
+ */
+ public Builder logger(ILogger logger) {
+ this.logger = logger;
+ return this;
+ }
+
+ /**
+ * Set whether logging is silent (disabled). Defaults to {@code true}.
+ * Set to {@code false} to enable log output.
+ */
+ public Builder silent(boolean silent) {
+ this.silent = silent;
+ return this;
+ }
+
+ public LogConfig build() {
+ return new LogConfig(level, logger, silent);
+ }
+ }
+}
diff --git a/src/main/java/com/schematic/api/core/LogLevel.java b/src/main/java/com/schematic/api/core/LogLevel.java
new file mode 100644
index 0000000..f9f4ad4
--- /dev/null
+++ b/src/main/java/com/schematic/api/core/LogLevel.java
@@ -0,0 +1,36 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.schematic.api.core;
+
+/**
+ * Log levels for SDK logging configuration.
+ * Silent by default — no log output unless explicitly configured.
+ */
+public enum LogLevel {
+ DEBUG(1),
+ INFO(2),
+ WARN(3),
+ ERROR(4);
+
+ private final int value;
+
+ LogLevel(int value) {
+ this.value = value;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Parse a log level from a string (case-insensitive).
+ *
+ * @param level the level string (debug, info, warn, error)
+ * @return the corresponding LogLevel
+ * @throws IllegalArgumentException if the string does not match any level
+ */
+ public static LogLevel fromString(String level) {
+ return LogLevel.valueOf(level.toUpperCase());
+ }
+}
diff --git a/src/main/java/com/schematic/api/core/Logger.java b/src/main/java/com/schematic/api/core/Logger.java
new file mode 100644
index 0000000..25e4696
--- /dev/null
+++ b/src/main/java/com/schematic/api/core/Logger.java
@@ -0,0 +1,97 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.schematic.api.core;
+
+/**
+ * SDK logger that filters messages based on level and silent mode.
+ *
+ * Silent by default — no log output unless explicitly configured.
+ * Create via {@link LogConfig} or directly:
+ *
{@code
+ * Logger logger = new Logger(LogLevel.DEBUG, new ConsoleLogger(), false);
+ * logger.debug("request sent");
+ * }
+ */
+public final class Logger {
+
+ private static final Logger DEFAULT = new Logger(LogLevel.INFO, new ConsoleLogger(), true);
+
+ private final LogLevel level;
+ private final ILogger logger;
+ private final boolean silent;
+
+ public Logger(LogLevel level, ILogger logger, boolean silent) {
+ this.level = level;
+ this.logger = logger;
+ this.silent = silent;
+ }
+
+ /**
+ * Returns a default silent logger (no output).
+ */
+ public static Logger getDefault() {
+ return DEFAULT;
+ }
+
+ /**
+ * Creates a Logger from a {@link LogConfig}. If config is {@code null}, returns the default silent logger.
+ */
+ public static Logger from(LogConfig config) {
+ if (config == null) {
+ return DEFAULT;
+ }
+ return new Logger(config.level(), config.logger(), config.silent());
+ }
+
+ /**
+ * Creates a Logger from an {@code Optional}. If empty, returns the default silent logger.
+ */
+ public static Logger from(java.util.Optional config) {
+ return config.map(Logger::from).orElse(DEFAULT);
+ }
+
+ private boolean shouldLog(LogLevel messageLevel) {
+ return !silent && level.getValue() <= messageLevel.getValue();
+ }
+
+ public boolean isDebug() {
+ return shouldLog(LogLevel.DEBUG);
+ }
+
+ public boolean isInfo() {
+ return shouldLog(LogLevel.INFO);
+ }
+
+ public boolean isWarn() {
+ return shouldLog(LogLevel.WARN);
+ }
+
+ public boolean isError() {
+ return shouldLog(LogLevel.ERROR);
+ }
+
+ public void debug(String message) {
+ if (isDebug()) {
+ logger.debug(message);
+ }
+ }
+
+ public void info(String message) {
+ if (isInfo()) {
+ logger.info(message);
+ }
+ }
+
+ public void warn(String message) {
+ if (isWarn()) {
+ logger.warn(message);
+ }
+ }
+
+ public void error(String message) {
+ if (isError()) {
+ logger.error(message);
+ }
+ }
+}
diff --git a/src/main/java/com/schematic/api/core/LoggingInterceptor.java b/src/main/java/com/schematic/api/core/LoggingInterceptor.java
new file mode 100644
index 0000000..c7d2dd5
--- /dev/null
+++ b/src/main/java/com/schematic/api/core/LoggingInterceptor.java
@@ -0,0 +1,104 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.schematic.api.core;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+
+/**
+ * OkHttp interceptor that logs HTTP requests and responses.
+ *
+ * Logs request method, URL, and headers (with sensitive values redacted) at debug level.
+ * Logs response status at debug level, and 4xx/5xx responses at error level.
+ * Does nothing if the logger is silent.
+ */
+public final class LoggingInterceptor implements Interceptor {
+
+ private static final Set SENSITIVE_HEADERS = new HashSet<>(Arrays.asList(
+ "authorization",
+ "www-authenticate",
+ "x-api-key",
+ "api-key",
+ "apikey",
+ "x-api-token",
+ "x-auth-token",
+ "auth-token",
+ "proxy-authenticate",
+ "proxy-authorization",
+ "cookie",
+ "set-cookie",
+ "x-csrf-token",
+ "x-xsrf-token",
+ "x-session-token",
+ "x-access-token"));
+
+ private final Logger logger;
+
+ public LoggingInterceptor(Logger logger) {
+ this.logger = logger;
+ }
+
+ @Override
+ public Response intercept(Chain chain) throws IOException {
+ Request request = chain.request();
+
+ if (logger.isDebug()) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("HTTP Request: ").append(request.method()).append(" ").append(request.url());
+ sb.append(" headers={");
+ boolean first = true;
+ for (String name : request.headers().names()) {
+ if (!first) {
+ sb.append(", ");
+ }
+ sb.append(name).append("=");
+ if (SENSITIVE_HEADERS.contains(name.toLowerCase())) {
+ sb.append("[REDACTED]");
+ } else {
+ sb.append(request.header(name));
+ }
+ first = false;
+ }
+ sb.append("}");
+ sb.append(" has_body=").append(request.body() != null);
+ logger.debug(sb.toString());
+ }
+
+ Response response = chain.proceed(request);
+
+ if (logger.isDebug()) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("HTTP Response: status=").append(response.code());
+ sb.append(" url=").append(response.request().url());
+ sb.append(" headers={");
+ boolean first = true;
+ for (String name : response.headers().names()) {
+ if (!first) {
+ sb.append(", ");
+ }
+ sb.append(name).append("=");
+ if (SENSITIVE_HEADERS.contains(name.toLowerCase())) {
+ sb.append("[REDACTED]");
+ } else {
+ sb.append(response.header(name));
+ }
+ first = false;
+ }
+ sb.append("}");
+ logger.debug(sb.toString());
+ }
+
+ if (response.code() >= 400 && logger.isError()) {
+ logger.error("HTTP Error: status=" + response.code() + " url="
+ + response.request().url());
+ }
+
+ return response;
+ }
+}
diff --git a/src/main/java/com/schematic/api/core/NullableNonemptyFilter.java b/src/main/java/com/schematic/api/core/NullableNonemptyFilter.java
index f230447..db75c3e 100644
--- a/src/main/java/com/schematic/api/core/NullableNonemptyFilter.java
+++ b/src/main/java/com/schematic/api/core/NullableNonemptyFilter.java
@@ -14,6 +14,9 @@ public boolean equals(Object o) {
}
private boolean isOptionalEmpty(Object o) {
- return o instanceof Optional && !((Optional) o).isPresent();
+ if (o instanceof Optional) {
+ return !((Optional) o).isPresent();
+ }
+ return false;
}
}
diff --git a/src/main/java/com/schematic/api/core/ObjectMappers.java b/src/main/java/com/schematic/api/core/ObjectMappers.java
index fd6b153..245e74e 100644
--- a/src/main/java/com/schematic/api/core/ObjectMappers.java
+++ b/src/main/java/com/schematic/api/core/ObjectMappers.java
@@ -4,6 +4,7 @@
package com.schematic.api.core;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
@@ -17,6 +18,7 @@ public final class ObjectMappers {
.addModule(new Jdk8Module())
.addModule(new JavaTimeModule())
.addModule(DateTimeDeserializer.getModule())
+ .addModule(DoubleSerializer.getModule())
.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
.build();
@@ -33,4 +35,12 @@ public static String stringify(Object o) {
return o.getClass().getName() + "@" + Integer.toHexString(o.hashCode());
}
}
+
+ public static Object parseErrorBody(String responseBodyString) {
+ try {
+ return JSON_MAPPER.readValue(responseBodyString, Object.class);
+ } catch (JsonProcessingException ignored) {
+ return responseBodyString;
+ }
+ }
}
diff --git a/src/main/java/com/schematic/api/core/RequestOptions.java b/src/main/java/com/schematic/api/core/RequestOptions.java
index 4618051..7249e3c 100644
--- a/src/main/java/com/schematic/api/core/RequestOptions.java
+++ b/src/main/java/com/schematic/api/core/RequestOptions.java
@@ -20,17 +20,25 @@ public final class RequestOptions {
private final Map> headerSuppliers;
+ private final Map queryParameters;
+
+ private final Map> queryParameterSuppliers;
+
private RequestOptions(
String apiKey,
Optional timeout,
TimeUnit timeoutTimeUnit,
Map headers,
- Map> headerSuppliers) {
+ Map> headerSuppliers,
+ Map queryParameters,
+ Map> queryParameterSuppliers) {
this.apiKey = apiKey;
this.timeout = timeout;
this.timeoutTimeUnit = timeoutTimeUnit;
this.headers = headers;
this.headerSuppliers = headerSuppliers;
+ this.queryParameters = queryParameters;
+ this.queryParameterSuppliers = queryParameterSuppliers;
}
public Optional getTimeout() {
@@ -53,6 +61,14 @@ public Map getHeaders() {
return headers;
}
+ public Map getQueryParameters() {
+ Map queryParameters = new HashMap<>(this.queryParameters);
+ this.queryParameterSuppliers.forEach((key, supplier) -> {
+ queryParameters.put(key, supplier.get());
+ });
+ return queryParameters;
+ }
+
public static Builder builder() {
return new Builder();
}
@@ -68,6 +84,10 @@ public static class Builder {
private final Map> headerSuppliers = new HashMap<>();
+ private final Map queryParameters = new HashMap<>();
+
+ private final Map> queryParameterSuppliers = new HashMap<>();
+
public Builder apiKey(String apiKey) {
this.apiKey = apiKey;
return this;
@@ -94,8 +114,25 @@ public Builder addHeader(String key, Supplier value) {
return this;
}
+ public Builder addQueryParameter(String key, String value) {
+ this.queryParameters.put(key, value);
+ return this;
+ }
+
+ public Builder addQueryParameter(String key, Supplier value) {
+ this.queryParameterSuppliers.put(key, value);
+ return this;
+ }
+
public RequestOptions build() {
- return new RequestOptions(apiKey, timeout, timeoutTimeUnit, headers, headerSuppliers);
+ return new RequestOptions(
+ apiKey,
+ timeout,
+ timeoutTimeUnit,
+ headers,
+ headerSuppliers,
+ queryParameters,
+ queryParameterSuppliers);
}
}
}
diff --git a/src/main/java/com/schematic/api/core/Rfc2822DateTimeDeserializer.java b/src/main/java/com/schematic/api/core/Rfc2822DateTimeDeserializer.java
new file mode 100644
index 0000000..ed0ff30
--- /dev/null
+++ b/src/main/java/com/schematic/api/core/Rfc2822DateTimeDeserializer.java
@@ -0,0 +1,25 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.schematic.api.core;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import java.io.IOException;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * Custom deserializer that handles converting RFC 2822 (RFC 1123) dates into {@link OffsetDateTime} objects.
+ * This is used for fields with format "date-time-rfc-2822", such as Twilio's dateCreated, dateSent, dateUpdated.
+ */
+public class Rfc2822DateTimeDeserializer extends JsonDeserializer {
+
+ @Override
+ public OffsetDateTime deserialize(JsonParser parser, DeserializationContext context) throws IOException {
+ String raw = parser.getValueAsString();
+ return ZonedDateTime.parse(raw, DateTimeFormatter.RFC_1123_DATE_TIME).toOffsetDateTime();
+ }
+}
diff --git a/src/main/java/com/schematic/api/core/SseEvent.java b/src/main/java/com/schematic/api/core/SseEvent.java
new file mode 100644
index 0000000..1640f67
--- /dev/null
+++ b/src/main/java/com/schematic/api/core/SseEvent.java
@@ -0,0 +1,114 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.schematic.api.core;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * Represents a Server-Sent Event with all standard fields.
+ * Used for event-level discrimination where the discriminator is at the SSE envelope level.
+ *
+ * @param The type of the data field
+ */
+@JsonInclude(JsonInclude.Include.NON_ABSENT)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public final class SseEvent {
+ private final String event;
+ private final T data;
+ private final String id;
+ private final Long retry;
+
+ private SseEvent(String event, T data, String id, Long retry) {
+ this.event = event;
+ this.data = data;
+ this.id = id;
+ this.retry = retry;
+ }
+
+ @JsonProperty("event")
+ public Optional getEvent() {
+ return Optional.ofNullable(event);
+ }
+
+ @JsonProperty("data")
+ public T getData() {
+ return data;
+ }
+
+ @JsonProperty("id")
+ public Optional getId() {
+ return Optional.ofNullable(id);
+ }
+
+ @JsonProperty("retry")
+ public Optional getRetry() {
+ return Optional.ofNullable(retry);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ SseEvent sseEvent = (SseEvent) o;
+ return Objects.equals(event, sseEvent.event)
+ && Objects.equals(data, sseEvent.data)
+ && Objects.equals(id, sseEvent.id)
+ && Objects.equals(retry, sseEvent.retry);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(event, data, id, retry);
+ }
+
+ @Override
+ public String toString() {
+ return "SseEvent{" + "event='"
+ + event + '\'' + ", data="
+ + data + ", id='"
+ + id + '\'' + ", retry="
+ + retry + '}';
+ }
+
+ public static Builder builder() {
+ return new Builder<>();
+ }
+
+ public static final class Builder {
+ private String event;
+ private T data;
+ private String id;
+ private Long retry;
+
+ private Builder() {}
+
+ public Builder event(String event) {
+ this.event = event;
+ return this;
+ }
+
+ public Builder data(T data) {
+ this.data = data;
+ return this;
+ }
+
+ public Builder id(String id) {
+ this.id = id;
+ return this;
+ }
+
+ public Builder retry(Long retry) {
+ this.retry = retry;
+ return this;
+ }
+
+ public SseEvent build() {
+ return new SseEvent<>(event, data, id, retry);
+ }
+ }
+}
diff --git a/src/main/java/com/schematic/api/core/SseEventParser.java b/src/main/java/com/schematic/api/core/SseEventParser.java
new file mode 100644
index 0000000..eafd44d
--- /dev/null
+++ b/src/main/java/com/schematic/api/core/SseEventParser.java
@@ -0,0 +1,228 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.schematic.api.core;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.core.type.TypeReference;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * Utility class for parsing Server-Sent Events with support for discriminated unions.
+ *
+ * Handles two discrimination patterns:
+ *
+ * - Data-level discrimination: The discriminator (e.g., 'type') is inside the JSON data payload.
+ * Jackson's polymorphic deserialization handles this automatically.
+ * - Event-level discrimination: The discriminator (e.g., 'event') is at the SSE envelope level.
+ * This requires constructing the full SSE envelope for Jackson to process.
+ *
+ */
+public final class SseEventParser {
+
+ private static final Set SSE_ENVELOPE_FIELDS = new HashSet<>(Arrays.asList("event", "data", "id", "retry"));
+
+ private SseEventParser() {
+ // Utility class
+ }
+
+ /**
+ * Parse an SSE event using event-level discrimination.
+ *
+ * Constructs the full SSE envelope object with event, data, id, and retry fields,
+ * then deserializes it to the target union type.
+ *
+ * @param eventType The SSE event type (from event: field)
+ * @param data The SSE data content (from data: field)
+ * @param id The SSE event ID (from id: field), may be null
+ * @param retry The SSE retry value (from retry: field), may be null
+ * @param unionClass The target union class
+ * @param discriminatorProperty The property name used for discrimination (e.g., "event")
+ * @param The target type
+ * @return The deserialized object
+ */
+ public static T parseEventLevelUnion(
+ String eventType, String data, String id, Long retry, Class unionClass, String discriminatorProperty) {
+ try {
+ // Determine if data should be parsed as JSON based on the variant's expected type
+ Object parsedData = parseDataForVariant(eventType, data, unionClass, discriminatorProperty);
+
+ // Construct the SSE envelope object
+ Map envelope = new HashMap<>();
+ envelope.put(discriminatorProperty, eventType);
+ envelope.put("data", parsedData);
+ if (id != null) {
+ envelope.put("id", id);
+ }
+ if (retry != null) {
+ envelope.put("retry", retry);
+ }
+
+ // Serialize to JSON and deserialize to target type
+ String envelopeJson = ObjectMappers.JSON_MAPPER.writeValueAsString(envelope);
+ return ObjectMappers.JSON_MAPPER.readValue(envelopeJson, unionClass);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to parse SSE event with event-level discrimination", e);
+ }
+ }
+
+ /**
+ * Parse an SSE event using data-level discrimination.
+ *
+ * Simply parses the data field as JSON and deserializes it to the target type.
+ * Jackson's polymorphic deserialization handles the discrimination automatically.
+ *
+ * @param data The SSE data content (from data: field)
+ * @param valueType The target type
+ * @param The target type
+ * @return The deserialized object
+ */
+ public static T parseDataLevelUnion(String data, Class valueType) {
+ try {
+ return ObjectMappers.JSON_MAPPER.readValue(data, valueType);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to parse SSE data with data-level discrimination", e);
+ }
+ }
+
+ /**
+ * Determines if the given discriminator property indicates event-level discrimination.
+ * Event-level discrimination occurs when the discriminator is an SSE envelope field.
+ *
+ * @param discriminatorProperty The discriminator property name
+ * @return true if event-level discrimination, false otherwise
+ */
+ public static boolean isEventLevelDiscrimination(String discriminatorProperty) {
+ return SSE_ENVELOPE_FIELDS.contains(discriminatorProperty);
+ }
+
+ /**
+ * Attempts to find the discriminator property from the union class's Jackson annotations.
+ *
+ * @param unionClass The union class to inspect
+ * @return The discriminator property name, or empty if not found
+ */
+ public static Optional findDiscriminatorProperty(Class unionClass) {
+ try {
+ // Look for JsonTypeInfo on the class itself
+ JsonTypeInfo typeInfo = unionClass.getAnnotation(JsonTypeInfo.class);
+ if (typeInfo != null && !typeInfo.property().isEmpty()) {
+ return Optional.of(typeInfo.property());
+ }
+
+ // Look for inner Value interface with JsonTypeInfo
+ for (Class innerClass : unionClass.getDeclaredClasses()) {
+ typeInfo = innerClass.getAnnotation(JsonTypeInfo.class);
+ if (typeInfo != null && !typeInfo.property().isEmpty()) {
+ return Optional.of(typeInfo.property());
+ }
+ }
+ } catch (Exception e) {
+ // Ignore reflection errors
+ }
+ return Optional.empty();
+ }
+
+ /**
+ * Parse the data field based on what the matching variant expects.
+ * If the variant expects a String for its data field, returns the raw string.
+ * Otherwise, parses the data as JSON.
+ */
+ private static Object parseDataForVariant(
+ String eventType, String data, Class unionClass, String discriminatorProperty) {
+ if (data == null || data.isEmpty()) {
+ return data;
+ }
+
+ try {
+ // Try to find the variant class that matches this event type
+ Class variantClass = findVariantClass(unionClass, eventType, discriminatorProperty);
+ if (variantClass != null) {
+ // Check if the variant expects a String for the data field
+ Field dataField = findField(variantClass, "data");
+ if (dataField != null && String.class.equals(dataField.getType())) {
+ // Variant expects String - return raw data
+ return data;
+ }
+ }
+
+ // Try to parse as JSON
+ return ObjectMappers.JSON_MAPPER.readValue(data, new TypeReference>() {});
+ } catch (Exception e) {
+ // If JSON parsing fails, return as string
+ return data;
+ }
+ }
+
+ /**
+ * Find the variant class that matches the given discriminator value.
+ */
+ private static Class findVariantClass(
+ Class unionClass, String discriminatorValue, String discriminatorProperty) {
+ try {
+ // Look for JsonSubTypes annotation
+ JsonSubTypes subTypes = findJsonSubTypes(unionClass);
+ if (subTypes == null) {
+ return null;
+ }
+
+ for (JsonSubTypes.Type subType : subTypes.value()) {
+ JsonTypeName typeName = subType.value().getAnnotation(JsonTypeName.class);
+ if (typeName != null && typeName.value().equals(discriminatorValue)) {
+ return subType.value();
+ }
+ // Also check the name attribute of @JsonSubTypes.Type
+ if (subType.name().equals(discriminatorValue)) {
+ return subType.value();
+ }
+ }
+ } catch (Exception e) {
+ // Ignore reflection errors
+ }
+ return null;
+ }
+
+ /**
+ * Find JsonSubTypes annotation on the class or its inner classes.
+ */
+ private static JsonSubTypes findJsonSubTypes(Class unionClass) {
+ // Check the class itself
+ JsonSubTypes subTypes = unionClass.getAnnotation(JsonSubTypes.class);
+ if (subTypes != null) {
+ return subTypes;
+ }
+
+ // Check inner classes (for Fern-style unions with inner Value interface)
+ for (Class innerClass : unionClass.getDeclaredClasses()) {
+ subTypes = innerClass.getAnnotation(JsonSubTypes.class);
+ if (subTypes != null) {
+ return subTypes;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Find a field by name in a class, including private fields.
+ */
+ private static Field findField(Class clazz, String fieldName) {
+ try {
+ return clazz.getDeclaredField(fieldName);
+ } catch (NoSuchFieldException e) {
+ // Check superclass
+ Class superClass = clazz.getSuperclass();
+ if (superClass != null && superClass != Object.class) {
+ return findField(superClass, fieldName);
+ }
+ return null;
+ }
+ }
+}
diff --git a/src/main/java/com/schematic/api/core/Stream.java b/src/main/java/com/schematic/api/core/Stream.java
index b4e9ab3..1fa4d2a 100644
--- a/src/main/java/com/schematic/api/core/Stream.java
+++ b/src/main/java/com/schematic/api/core/Stream.java
@@ -28,7 +28,8 @@ public final class Stream implements Iterable, Closeable {
public enum StreamType {
JSON,
- SSE
+ SSE,
+ SSE_EVENT_DISCRIMINATED
}
private final Class valueType;
@@ -37,6 +38,7 @@ public enum StreamType {
private final String messageTerminator;
private final String streamTerminator;
private final Reader sseReader;
+ private final String discriminatorProperty;
private boolean isClosed = false;
/**
@@ -53,11 +55,18 @@ public Stream(Class valueType, Reader reader, String delimiter) {
this.messageTerminator = delimiter;
this.streamTerminator = null;
this.sseReader = null;
+ this.discriminatorProperty = null;
}
private Stream(Class valueType, StreamType type, Reader reader, String terminator) {
+ this(valueType, type, reader, terminator, null);
+ }
+
+ private Stream(
+ Class valueType, StreamType type, Reader reader, String terminator, String discriminatorProperty) {
this.valueType = valueType;
this.streamType = type;
+ this.discriminatorProperty = discriminatorProperty;
if (type == StreamType.JSON) {
this.scanner = new Scanner(reader).useDelimiter(terminator);
this.messageTerminator = terminator;
@@ -87,6 +96,38 @@ public static Stream fromSse(Class valueType, Reader sseReader, String
return new Stream<>(valueType, StreamType.SSE, sseReader, streamTerminator);
}
+ /**
+ * Creates a stream from SSE data with event-level discrimination support.
+ * Use this when the SSE payload is a discriminated union where the discriminator
+ * is an SSE envelope field (e.g., 'event').
+ *
+ * @param valueType The class of the objects in the stream.
+ * @param sseReader The reader that provides the SSE data.
+ * @param discriminatorProperty The property name used for discrimination (e.g., "event").
+ * @param The type of objects in the stream.
+ * @return A new Stream instance configured for SSE with event-level discrimination.
+ */
+ public static Stream fromSseWithEventDiscrimination(
+ Class valueType, Reader sseReader, String discriminatorProperty) {
+ return new Stream<>(valueType, StreamType.SSE_EVENT_DISCRIMINATED, sseReader, null, discriminatorProperty);
+ }
+
+ /**
+ * Creates a stream from SSE data with event-level discrimination support and a stream terminator.
+ *
+ * @param valueType The class of the objects in the stream.
+ * @param sseReader The reader that provides the SSE data.
+ * @param discriminatorProperty The property name used for discrimination (e.g., "event").
+ * @param streamTerminator The terminator string that signals end of stream (e.g., "[DONE]").
+ * @param The type of objects in the stream.
+ * @return A new Stream instance configured for SSE with event-level discrimination.
+ */
+ public static Stream fromSseWithEventDiscrimination(
+ Class valueType, Reader sseReader, String discriminatorProperty, String streamTerminator) {
+ return new Stream<>(
+ valueType, StreamType.SSE_EVENT_DISCRIMINATED, sseReader, streamTerminator, discriminatorProperty);
+ }
+
@Override
public void close() throws IOException {
if (!isClosed) {
@@ -112,10 +153,14 @@ private boolean isStreamClosed() {
*/
@Override
public Iterator iterator() {
- if (streamType == StreamType.SSE) {
- return new SSEIterator();
- } else {
- return new JsonIterator();
+ switch (streamType) {
+ case SSE:
+ return new SSEIterator();
+ case SSE_EVENT_DISCRIMINATED:
+ return new SSEEventDiscriminatedIterator();
+ case JSON:
+ default:
+ return new JsonIterator();
}
}
@@ -299,4 +344,170 @@ private boolean readNextMessage() {
}
}
}
+
+ /**
+ * Iterator for SSE streams with event-level discrimination.
+ * Uses SseEventParser to construct the full SSE envelope for Jackson deserialization.
+ */
+ private final class SSEEventDiscriminatedIterator implements Iterator {
+ private Scanner sseScanner;
+ private T nextItem;
+ private boolean hasNextItem = false;
+ private boolean endOfStream = false;
+ private StringBuilder eventDataBuffer = new StringBuilder();
+ private String currentEventType = null;
+ private String currentEventId = null;
+ private Long currentRetry = null;
+
+ private SSEEventDiscriminatedIterator() {
+ if (sseReader != null && !isStreamClosed()) {
+ this.sseScanner = new Scanner(sseReader);
+ } else {
+ this.endOfStream = true;
+ }
+ }
+
+ @Override
+ public boolean hasNext() {
+ if (isStreamClosed() || endOfStream) {
+ return false;
+ }
+
+ if (hasNextItem) {
+ return true;
+ }
+
+ return readNextMessage();
+ }
+
+ @Override
+ public T next() {
+ if (!hasNext()) {
+ throw new NoSuchElementException("No more elements in stream");
+ }
+
+ T result = nextItem;
+ nextItem = null;
+ hasNextItem = false;
+ return result;
+ }
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+
+ private boolean readNextMessage() {
+ if (sseScanner == null || isStreamClosed()) {
+ endOfStream = true;
+ return false;
+ }
+
+ try {
+ while (sseScanner.hasNextLine()) {
+ String line = sseScanner.nextLine();
+
+ if (line.trim().isEmpty()) {
+ if (eventDataBuffer.length() > 0 || currentEventType != null) {
+ try {
+ // Use SseEventParser for event-level discrimination
+ nextItem = SseEventParser.parseEventLevelUnion(
+ currentEventType,
+ eventDataBuffer.toString(),
+ currentEventId,
+ currentRetry,
+ valueType,
+ discriminatorProperty);
+ hasNextItem = true;
+ resetEventState();
+ return true;
+ } catch (Exception parseEx) {
+ System.err.println("Failed to parse SSE event: " + parseEx.getMessage());
+ resetEventState();
+ continue;
+ }
+ }
+ continue;
+ }
+
+ if (line.startsWith(DATA_PREFIX)) {
+ String dataContent = line.substring(DATA_PREFIX.length());
+ if (dataContent.startsWith(" ")) {
+ dataContent = dataContent.substring(1);
+ }
+
+ if (eventDataBuffer.length() == 0
+ && streamTerminator != null
+ && dataContent.trim().equals(streamTerminator)) {
+ endOfStream = true;
+ return false;
+ }
+
+ if (eventDataBuffer.length() > 0) {
+ eventDataBuffer.append('\n');
+ }
+ eventDataBuffer.append(dataContent);
+ } else if (line.startsWith("event:")) {
+ String eventValue = line.length() > 6 ? line.substring(6) : "";
+ if (eventValue.startsWith(" ")) {
+ eventValue = eventValue.substring(1);
+ }
+ currentEventType = eventValue;
+ } else if (line.startsWith("id:")) {
+ String idValue = line.length() > 3 ? line.substring(3) : "";
+ if (idValue.startsWith(" ")) {
+ idValue = idValue.substring(1);
+ }
+ currentEventId = idValue;
+ } else if (line.startsWith("retry:")) {
+ String retryValue = line.length() > 6 ? line.substring(6) : "";
+ if (retryValue.startsWith(" ")) {
+ retryValue = retryValue.substring(1);
+ }
+ try {
+ currentRetry = Long.parseLong(retryValue.trim());
+ } catch (NumberFormatException e) {
+ // Ignore invalid retry values
+ }
+ } else if (line.startsWith(":")) {
+ // Comment line (ignored)
+ }
+ }
+
+ // Handle any remaining buffered data at end of stream
+ if (eventDataBuffer.length() > 0 || currentEventType != null) {
+ try {
+ nextItem = SseEventParser.parseEventLevelUnion(
+ currentEventType,
+ eventDataBuffer.toString(),
+ currentEventId,
+ currentRetry,
+ valueType,
+ discriminatorProperty);
+ hasNextItem = true;
+ resetEventState();
+ return true;
+ } catch (Exception parseEx) {
+ System.err.println("Failed to parse final SSE event: " + parseEx.getMessage());
+ resetEventState();
+ }
+ }
+
+ endOfStream = true;
+ return false;
+
+ } catch (Exception e) {
+ System.err.println("Failed to parse SSE stream: " + e.getMessage());
+ endOfStream = true;
+ return false;
+ }
+ }
+
+ private void resetEventState() {
+ eventDataBuffer.setLength(0);
+ currentEventType = null;
+ currentEventId = null;
+ currentRetry = null;
+ }
+ }
}
diff --git a/src/main/java/com/schematic/api/resources/accesstokens/AsyncRawAccesstokensClient.java b/src/main/java/com/schematic/api/resources/accesstokens/AsyncRawAccesstokensClient.java
index 95f064e..66c0380 100644
--- a/src/main/java/com/schematic/api/resources/accesstokens/AsyncRawAccesstokensClient.java
+++ b/src/main/java/com/schematic/api/resources/accesstokens/AsyncRawAccesstokensClient.java
@@ -46,10 +46,14 @@ public CompletableFuture> issueTemporaryAccessToken(
IssueTemporaryAccessTokenRequestBody request, RequestOptions requestOptions) {
- HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("temporary-access-tokens")
- .build();
+ .addPathSegments("temporary-access-tokens");
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
RequestBody body;
try {
body = RequestBody.create(
@@ -58,7 +62,7 @@ public CompletableFuture(
ObjectMappers.JSON_MAPPER.readValue(
- responseBody.string(), IssueTemporaryAccessTokenResponse.class),
+ responseBodyString, IssueTemporaryAccessTokenResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 400:
@@ -113,11 +117,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
diff --git a/src/main/java/com/schematic/api/resources/accesstokens/RawAccesstokensClient.java b/src/main/java/com/schematic/api/resources/accesstokens/RawAccesstokensClient.java
index d9553c9..039327b 100644
--- a/src/main/java/com/schematic/api/resources/accesstokens/RawAccesstokensClient.java
+++ b/src/main/java/com/schematic/api/resources/accesstokens/RawAccesstokensClient.java
@@ -42,10 +42,14 @@ public BaseSchematicHttpResponse issueTempora
public BaseSchematicHttpResponse issueTemporaryAccessToken(
IssueTemporaryAccessTokenRequestBody request, RequestOptions requestOptions) {
- HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("temporary-access-tokens")
- .build();
+ .addPathSegments("temporary-access-tokens");
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
RequestBody body;
try {
body = RequestBody.create(
@@ -54,7 +58,7 @@ public BaseSchematicHttpResponse issueTempora
throw new BaseSchematicException("Failed to serialize request", e);
}
Request okhttpRequest = new Request.Builder()
- .url(httpUrl)
+ .url(httpUrl.build())
.method("POST", body)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Content-Type", "application/json")
@@ -66,13 +70,13 @@ public BaseSchematicHttpResponse issueTempora
}
try (Response response = client.newCall(okhttpRequest).execute()) {
ResponseBody responseBody = response.body();
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
return new BaseSchematicHttpResponse<>(
ObjectMappers.JSON_MAPPER.readValue(
- responseBody.string(), IssueTemporaryAccessTokenResponse.class),
+ responseBodyString, IssueTemporaryAccessTokenResponse.class),
response);
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 400:
@@ -94,11 +98,9 @@ public BaseSchematicHttpResponse issueTempora
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
throw new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response);
+ "Error with status code " + response.code(), response.code(), errorBody, response);
} catch (IOException e) {
throw new BaseSchematicException("Network error executing HTTP request", e);
}
diff --git a/src/main/java/com/schematic/api/resources/accesstokens/requests/IssueTemporaryAccessTokenRequestBody.java b/src/main/java/com/schematic/api/resources/accesstokens/requests/IssueTemporaryAccessTokenRequestBody.java
index 9990e0d..b401613 100644
--- a/src/main/java/com/schematic/api/resources/accesstokens/requests/IssueTemporaryAccessTokenRequestBody.java
+++ b/src/main/java/com/schematic/api/resources/accesstokens/requests/IssueTemporaryAccessTokenRequestBody.java
@@ -83,6 +83,10 @@ public interface ResourceTypeStage {
public interface _FinalStage {
IssueTemporaryAccessTokenRequestBody build();
+ _FinalStage additionalProperty(String key, Object value);
+
+ _FinalStage additionalProperties(Map additionalProperties);
+
_FinalStage lookup(Map lookup);
_FinalStage putAllLookup(Map lookup);
@@ -143,5 +147,17 @@ public _FinalStage lookup(Map lookup) {
public IssueTemporaryAccessTokenRequestBody build() {
return new IssueTemporaryAccessTokenRequestBody(lookup, resourceType, additionalProperties);
}
+
+ @java.lang.Override
+ public Builder additionalProperty(String key, Object value) {
+ this.additionalProperties.put(key, value);
+ return this;
+ }
+
+ @java.lang.Override
+ public Builder additionalProperties(Map additionalProperties) {
+ this.additionalProperties.putAll(additionalProperties);
+ return this;
+ }
}
}
diff --git a/src/main/java/com/schematic/api/resources/accesstokens/types/IssueTemporaryAccessTokenResponse.java b/src/main/java/com/schematic/api/resources/accesstokens/types/IssueTemporaryAccessTokenResponse.java
index a2583ef..240c040 100644
--- a/src/main/java/com/schematic/api/resources/accesstokens/types/IssueTemporaryAccessTokenResponse.java
+++ b/src/main/java/com/schematic/api/resources/accesstokens/types/IssueTemporaryAccessTokenResponse.java
@@ -89,6 +89,10 @@ public interface DataStage {
public interface _FinalStage {
IssueTemporaryAccessTokenResponse build();
+ _FinalStage additionalProperty(String key, Object value);
+
+ _FinalStage additionalProperties(Map additionalProperties);
+
/**
* Input parameters
*/
@@ -163,5 +167,17 @@ public _FinalStage params(Map params) {
public IssueTemporaryAccessTokenResponse build() {
return new IssueTemporaryAccessTokenResponse(data, params, additionalProperties);
}
+
+ @java.lang.Override
+ public Builder additionalProperty(String key, Object value) {
+ this.additionalProperties.put(key, value);
+ return this;
+ }
+
+ @java.lang.Override
+ public Builder additionalProperties(Map additionalProperties) {
+ this.additionalProperties.putAll(additionalProperties);
+ return this;
+ }
}
}
diff --git a/src/main/java/com/schematic/api/resources/accounts/AccountsClient.java b/src/main/java/com/schematic/api/resources/accounts/AccountsClient.java
index 45393d5..4ddb1f1 100644
--- a/src/main/java/com/schematic/api/resources/accounts/AccountsClient.java
+++ b/src/main/java/com/schematic/api/resources/accounts/AccountsClient.java
@@ -6,29 +6,25 @@
import com.schematic.api.core.ClientOptions;
import com.schematic.api.core.RequestOptions;
import com.schematic.api.resources.accounts.requests.CountApiKeysRequest;
-import com.schematic.api.resources.accounts.requests.CountApiRequestsRequest;
import com.schematic.api.resources.accounts.requests.CountAuditLogsRequest;
import com.schematic.api.resources.accounts.requests.CreateApiKeyRequestBody;
import com.schematic.api.resources.accounts.requests.CreateEnvironmentRequestBody;
import com.schematic.api.resources.accounts.requests.ListApiKeysRequest;
-import com.schematic.api.resources.accounts.requests.ListApiRequestsRequest;
import com.schematic.api.resources.accounts.requests.ListAuditLogsRequest;
import com.schematic.api.resources.accounts.requests.ListEnvironmentsRequest;
import com.schematic.api.resources.accounts.requests.UpdateApiKeyRequestBody;
import com.schematic.api.resources.accounts.requests.UpdateEnvironmentRequestBody;
import com.schematic.api.resources.accounts.types.CountApiKeysResponse;
-import com.schematic.api.resources.accounts.types.CountApiRequestsResponse;
import com.schematic.api.resources.accounts.types.CountAuditLogsResponse;
import com.schematic.api.resources.accounts.types.CreateApiKeyResponse;
import com.schematic.api.resources.accounts.types.CreateEnvironmentResponse;
import com.schematic.api.resources.accounts.types.DeleteApiKeyResponse;
import com.schematic.api.resources.accounts.types.DeleteEnvironmentResponse;
import com.schematic.api.resources.accounts.types.GetApiKeyResponse;
-import com.schematic.api.resources.accounts.types.GetApiRequestResponse;
import com.schematic.api.resources.accounts.types.GetAuditLogResponse;
import com.schematic.api.resources.accounts.types.GetEnvironmentResponse;
+import com.schematic.api.resources.accounts.types.GetWhoAmIResponse;
import com.schematic.api.resources.accounts.types.ListApiKeysResponse;
-import com.schematic.api.resources.accounts.types.ListApiRequestsResponse;
import com.schematic.api.resources.accounts.types.ListAuditLogsResponse;
import com.schematic.api.resources.accounts.types.ListEnvironmentsResponse;
import com.schematic.api.resources.accounts.types.QuickstartResponse;
@@ -80,6 +76,10 @@ public UpdateApiKeyResponse updateApiKey(String apiKeyId) {
return this.rawClient.updateApiKey(apiKeyId).body();
}
+ public UpdateApiKeyResponse updateApiKey(String apiKeyId, RequestOptions requestOptions) {
+ return this.rawClient.updateApiKey(apiKeyId, requestOptions).body();
+ }
+
public UpdateApiKeyResponse updateApiKey(String apiKeyId, UpdateApiKeyRequestBody request) {
return this.rawClient.updateApiKey(apiKeyId, request).body();
}
@@ -105,42 +105,14 @@ public CountApiKeysResponse countApiKeys(CountApiKeysRequest request, RequestOpt
return this.rawClient.countApiKeys(request, requestOptions).body();
}
- public ListApiRequestsResponse listApiRequests() {
- return this.rawClient.listApiRequests().body();
- }
-
- public ListApiRequestsResponse listApiRequests(ListApiRequestsRequest request) {
- return this.rawClient.listApiRequests(request).body();
- }
-
- public ListApiRequestsResponse listApiRequests(ListApiRequestsRequest request, RequestOptions requestOptions) {
- return this.rawClient.listApiRequests(request, requestOptions).body();
- }
-
- public GetApiRequestResponse getApiRequest(String apiRequestId) {
- return this.rawClient.getApiRequest(apiRequestId).body();
- }
-
- public GetApiRequestResponse getApiRequest(String apiRequestId, RequestOptions requestOptions) {
- return this.rawClient.getApiRequest(apiRequestId, requestOptions).body();
- }
-
- public CountApiRequestsResponse countApiRequests() {
- return this.rawClient.countApiRequests().body();
- }
-
- public CountApiRequestsResponse countApiRequests(CountApiRequestsRequest request) {
- return this.rawClient.countApiRequests(request).body();
- }
-
- public CountApiRequestsResponse countApiRequests(CountApiRequestsRequest request, RequestOptions requestOptions) {
- return this.rawClient.countApiRequests(request, requestOptions).body();
- }
-
public ListAuditLogsResponse listAuditLogs() {
return this.rawClient.listAuditLogs().body();
}
+ public ListAuditLogsResponse listAuditLogs(RequestOptions requestOptions) {
+ return this.rawClient.listAuditLogs(requestOptions).body();
+ }
+
public ListAuditLogsResponse listAuditLogs(ListAuditLogsRequest request) {
return this.rawClient.listAuditLogs(request).body();
}
@@ -161,6 +133,10 @@ public CountAuditLogsResponse countAuditLogs() {
return this.rawClient.countAuditLogs().body();
}
+ public CountAuditLogsResponse countAuditLogs(RequestOptions requestOptions) {
+ return this.rawClient.countAuditLogs(requestOptions).body();
+ }
+
public CountAuditLogsResponse countAuditLogs(CountAuditLogsRequest request) {
return this.rawClient.countAuditLogs(request).body();
}
@@ -173,6 +149,10 @@ public ListEnvironmentsResponse listEnvironments() {
return this.rawClient.listEnvironments().body();
}
+ public ListEnvironmentsResponse listEnvironments(RequestOptions requestOptions) {
+ return this.rawClient.listEnvironments(requestOptions).body();
+ }
+
public ListEnvironmentsResponse listEnvironments(ListEnvironmentsRequest request) {
return this.rawClient.listEnvironments(request).body();
}
@@ -202,6 +182,10 @@ public UpdateEnvironmentResponse updateEnvironment(String environmentId) {
return this.rawClient.updateEnvironment(environmentId).body();
}
+ public UpdateEnvironmentResponse updateEnvironment(String environmentId, RequestOptions requestOptions) {
+ return this.rawClient.updateEnvironment(environmentId, requestOptions).body();
+ }
+
public UpdateEnvironmentResponse updateEnvironment(String environmentId, UpdateEnvironmentRequestBody request) {
return this.rawClient.updateEnvironment(environmentId, request).body();
}
@@ -228,4 +212,12 @@ public QuickstartResponse quickstart() {
public QuickstartResponse quickstart(RequestOptions requestOptions) {
return this.rawClient.quickstart(requestOptions).body();
}
+
+ public GetWhoAmIResponse getWhoAmI() {
+ return this.rawClient.getWhoAmI().body();
+ }
+
+ public GetWhoAmIResponse getWhoAmI(RequestOptions requestOptions) {
+ return this.rawClient.getWhoAmI(requestOptions).body();
+ }
}
diff --git a/src/main/java/com/schematic/api/resources/accounts/AsyncAccountsClient.java b/src/main/java/com/schematic/api/resources/accounts/AsyncAccountsClient.java
index 0e7b1a4..410c177 100644
--- a/src/main/java/com/schematic/api/resources/accounts/AsyncAccountsClient.java
+++ b/src/main/java/com/schematic/api/resources/accounts/AsyncAccountsClient.java
@@ -6,29 +6,25 @@
import com.schematic.api.core.ClientOptions;
import com.schematic.api.core.RequestOptions;
import com.schematic.api.resources.accounts.requests.CountApiKeysRequest;
-import com.schematic.api.resources.accounts.requests.CountApiRequestsRequest;
import com.schematic.api.resources.accounts.requests.CountAuditLogsRequest;
import com.schematic.api.resources.accounts.requests.CreateApiKeyRequestBody;
import com.schematic.api.resources.accounts.requests.CreateEnvironmentRequestBody;
import com.schematic.api.resources.accounts.requests.ListApiKeysRequest;
-import com.schematic.api.resources.accounts.requests.ListApiRequestsRequest;
import com.schematic.api.resources.accounts.requests.ListAuditLogsRequest;
import com.schematic.api.resources.accounts.requests.ListEnvironmentsRequest;
import com.schematic.api.resources.accounts.requests.UpdateApiKeyRequestBody;
import com.schematic.api.resources.accounts.requests.UpdateEnvironmentRequestBody;
import com.schematic.api.resources.accounts.types.CountApiKeysResponse;
-import com.schematic.api.resources.accounts.types.CountApiRequestsResponse;
import com.schematic.api.resources.accounts.types.CountAuditLogsResponse;
import com.schematic.api.resources.accounts.types.CreateApiKeyResponse;
import com.schematic.api.resources.accounts.types.CreateEnvironmentResponse;
import com.schematic.api.resources.accounts.types.DeleteApiKeyResponse;
import com.schematic.api.resources.accounts.types.DeleteEnvironmentResponse;
import com.schematic.api.resources.accounts.types.GetApiKeyResponse;
-import com.schematic.api.resources.accounts.types.GetApiRequestResponse;
import com.schematic.api.resources.accounts.types.GetAuditLogResponse;
import com.schematic.api.resources.accounts.types.GetEnvironmentResponse;
+import com.schematic.api.resources.accounts.types.GetWhoAmIResponse;
import com.schematic.api.resources.accounts.types.ListApiKeysResponse;
-import com.schematic.api.resources.accounts.types.ListApiRequestsResponse;
import com.schematic.api.resources.accounts.types.ListAuditLogsResponse;
import com.schematic.api.resources.accounts.types.ListEnvironmentsResponse;
import com.schematic.api.resources.accounts.types.QuickstartResponse;
@@ -83,6 +79,10 @@ public CompletableFuture updateApiKey(String apiKeyId) {
return this.rawClient.updateApiKey(apiKeyId).thenApply(response -> response.body());
}
+ public CompletableFuture updateApiKey(String apiKeyId, RequestOptions requestOptions) {
+ return this.rawClient.updateApiKey(apiKeyId, requestOptions).thenApply(response -> response.body());
+ }
+
public CompletableFuture updateApiKey(String apiKeyId, UpdateApiKeyRequestBody request) {
return this.rawClient.updateApiKey(apiKeyId, request).thenApply(response -> response.body());
}
@@ -109,44 +109,14 @@ public CompletableFuture countApiKeys(
return this.rawClient.countApiKeys(request, requestOptions).thenApply(response -> response.body());
}
- public CompletableFuture listApiRequests() {
- return this.rawClient.listApiRequests().thenApply(response -> response.body());
- }
-
- public CompletableFuture listApiRequests(ListApiRequestsRequest request) {
- return this.rawClient.listApiRequests(request).thenApply(response -> response.body());
- }
-
- public CompletableFuture listApiRequests(
- ListApiRequestsRequest request, RequestOptions requestOptions) {
- return this.rawClient.listApiRequests(request, requestOptions).thenApply(response -> response.body());
- }
-
- public CompletableFuture getApiRequest(String apiRequestId) {
- return this.rawClient.getApiRequest(apiRequestId).thenApply(response -> response.body());
- }
-
- public CompletableFuture getApiRequest(String apiRequestId, RequestOptions requestOptions) {
- return this.rawClient.getApiRequest(apiRequestId, requestOptions).thenApply(response -> response.body());
- }
-
- public CompletableFuture countApiRequests() {
- return this.rawClient.countApiRequests().thenApply(response -> response.body());
- }
-
- public CompletableFuture countApiRequests(CountApiRequestsRequest request) {
- return this.rawClient.countApiRequests(request).thenApply(response -> response.body());
- }
-
- public CompletableFuture countApiRequests(
- CountApiRequestsRequest request, RequestOptions requestOptions) {
- return this.rawClient.countApiRequests(request, requestOptions).thenApply(response -> response.body());
- }
-
public CompletableFuture listAuditLogs() {
return this.rawClient.listAuditLogs().thenApply(response -> response.body());
}
+ public CompletableFuture listAuditLogs(RequestOptions requestOptions) {
+ return this.rawClient.listAuditLogs(requestOptions).thenApply(response -> response.body());
+ }
+
public CompletableFuture listAuditLogs(ListAuditLogsRequest request) {
return this.rawClient.listAuditLogs(request).thenApply(response -> response.body());
}
@@ -168,6 +138,10 @@ public CompletableFuture countAuditLogs() {
return this.rawClient.countAuditLogs().thenApply(response -> response.body());
}
+ public CompletableFuture countAuditLogs(RequestOptions requestOptions) {
+ return this.rawClient.countAuditLogs(requestOptions).thenApply(response -> response.body());
+ }
+
public CompletableFuture countAuditLogs(CountAuditLogsRequest request) {
return this.rawClient.countAuditLogs(request).thenApply(response -> response.body());
}
@@ -181,6 +155,10 @@ public CompletableFuture listEnvironments() {
return this.rawClient.listEnvironments().thenApply(response -> response.body());
}
+ public CompletableFuture listEnvironments(RequestOptions requestOptions) {
+ return this.rawClient.listEnvironments(requestOptions).thenApply(response -> response.body());
+ }
+
public CompletableFuture listEnvironments(ListEnvironmentsRequest request) {
return this.rawClient.listEnvironments(request).thenApply(response -> response.body());
}
@@ -212,6 +190,11 @@ public CompletableFuture updateEnvironment(String env
return this.rawClient.updateEnvironment(environmentId).thenApply(response -> response.body());
}
+ public CompletableFuture updateEnvironment(
+ String environmentId, RequestOptions requestOptions) {
+ return this.rawClient.updateEnvironment(environmentId, requestOptions).thenApply(response -> response.body());
+ }
+
public CompletableFuture updateEnvironment(
String environmentId, UpdateEnvironmentRequestBody request) {
return this.rawClient.updateEnvironment(environmentId, request).thenApply(response -> response.body());
@@ -240,4 +223,12 @@ public CompletableFuture quickstart() {
public CompletableFuture quickstart(RequestOptions requestOptions) {
return this.rawClient.quickstart(requestOptions).thenApply(response -> response.body());
}
+
+ public CompletableFuture getWhoAmI() {
+ return this.rawClient.getWhoAmI().thenApply(response -> response.body());
+ }
+
+ public CompletableFuture getWhoAmI(RequestOptions requestOptions) {
+ return this.rawClient.getWhoAmI(requestOptions).thenApply(response -> response.body());
+ }
}
diff --git a/src/main/java/com/schematic/api/resources/accounts/AsyncRawAccountsClient.java b/src/main/java/com/schematic/api/resources/accounts/AsyncRawAccountsClient.java
index c951ef4..cf062f8 100644
--- a/src/main/java/com/schematic/api/resources/accounts/AsyncRawAccountsClient.java
+++ b/src/main/java/com/schematic/api/resources/accounts/AsyncRawAccountsClient.java
@@ -18,29 +18,25 @@
import com.schematic.api.errors.NotFoundError;
import com.schematic.api.errors.UnauthorizedError;
import com.schematic.api.resources.accounts.requests.CountApiKeysRequest;
-import com.schematic.api.resources.accounts.requests.CountApiRequestsRequest;
import com.schematic.api.resources.accounts.requests.CountAuditLogsRequest;
import com.schematic.api.resources.accounts.requests.CreateApiKeyRequestBody;
import com.schematic.api.resources.accounts.requests.CreateEnvironmentRequestBody;
import com.schematic.api.resources.accounts.requests.ListApiKeysRequest;
-import com.schematic.api.resources.accounts.requests.ListApiRequestsRequest;
import com.schematic.api.resources.accounts.requests.ListAuditLogsRequest;
import com.schematic.api.resources.accounts.requests.ListEnvironmentsRequest;
import com.schematic.api.resources.accounts.requests.UpdateApiKeyRequestBody;
import com.schematic.api.resources.accounts.requests.UpdateEnvironmentRequestBody;
import com.schematic.api.resources.accounts.types.CountApiKeysResponse;
-import com.schematic.api.resources.accounts.types.CountApiRequestsResponse;
import com.schematic.api.resources.accounts.types.CountAuditLogsResponse;
import com.schematic.api.resources.accounts.types.CreateApiKeyResponse;
import com.schematic.api.resources.accounts.types.CreateEnvironmentResponse;
import com.schematic.api.resources.accounts.types.DeleteApiKeyResponse;
import com.schematic.api.resources.accounts.types.DeleteEnvironmentResponse;
import com.schematic.api.resources.accounts.types.GetApiKeyResponse;
-import com.schematic.api.resources.accounts.types.GetApiRequestResponse;
import com.schematic.api.resources.accounts.types.GetAuditLogResponse;
import com.schematic.api.resources.accounts.types.GetEnvironmentResponse;
+import com.schematic.api.resources.accounts.types.GetWhoAmIResponse;
import com.schematic.api.resources.accounts.types.ListApiKeysResponse;
-import com.schematic.api.resources.accounts.types.ListApiRequestsResponse;
import com.schematic.api.resources.accounts.types.ListAuditLogsResponse;
import com.schematic.api.resources.accounts.types.ListEnvironmentsResponse;
import com.schematic.api.resources.accounts.types.QuickstartResponse;
@@ -89,6 +85,11 @@ public CompletableFuture> listApi
QueryStringMapper.addQueryParameter(
httpUrl, "offset", request.getOffset().get(), false);
}
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
Request.Builder _requestBuilder = new Request.Builder()
.url(httpUrl.build())
.method("GET", null)
@@ -104,13 +105,13 @@ public CompletableFuture> listApi
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ListApiKeysResponse.class),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ListApiKeysResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 400:
@@ -142,11 +143,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -168,10 +167,14 @@ public CompletableFuture> create
public CompletableFuture> createApiKey(
CreateApiKeyRequestBody request, RequestOptions requestOptions) {
- HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("api-keys")
- .build();
+ .addPathSegments("api-keys");
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
RequestBody body;
try {
body = RequestBody.create(
@@ -180,7 +183,7 @@ public CompletableFuture> create
throw new BaseSchematicException("Failed to serialize request", e);
}
Request okhttpRequest = new Request.Builder()
- .url(httpUrl)
+ .url(httpUrl.build())
.method("POST", body)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Content-Type", "application/json")
@@ -195,13 +198,13 @@ public CompletableFuture> create
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), CreateApiKeyResponse.class),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, CreateApiKeyResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 400:
@@ -233,11 +236,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -258,13 +259,17 @@ public CompletableFuture> getApiKey
public CompletableFuture> getApiKey(
String apiKeyId, RequestOptions requestOptions) {
- HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("api-keys")
- .addPathSegment(apiKeyId)
- .build();
+ .addPathSegment(apiKeyId);
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
Request okhttpRequest = new Request.Builder()
- .url(httpUrl)
+ .url(httpUrl.build())
.method("GET", null)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Accept", "application/json")
@@ -278,13 +283,13 @@ public CompletableFuture> getApiKey
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetApiKeyResponse.class),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, GetApiKeyResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 401:
@@ -311,11 +316,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -334,6 +337,11 @@ public CompletableFuture> update
return updateApiKey(apiKeyId, UpdateApiKeyRequestBody.builder().build());
}
+ public CompletableFuture> updateApiKey(
+ String apiKeyId, RequestOptions requestOptions) {
+ return updateApiKey(apiKeyId, UpdateApiKeyRequestBody.builder().build(), requestOptions);
+ }
+
public CompletableFuture> updateApiKey(
String apiKeyId, UpdateApiKeyRequestBody request) {
return updateApiKey(apiKeyId, request, null);
@@ -341,11 +349,15 @@ public CompletableFuture> update
public CompletableFuture> updateApiKey(
String apiKeyId, UpdateApiKeyRequestBody request, RequestOptions requestOptions) {
- HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("api-keys")
- .addPathSegment(apiKeyId)
- .build();
+ .addPathSegment(apiKeyId);
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
RequestBody body;
try {
body = RequestBody.create(
@@ -354,7 +366,7 @@ public CompletableFuture> update
throw new BaseSchematicException("Failed to serialize request", e);
}
Request okhttpRequest = new Request.Builder()
- .url(httpUrl)
+ .url(httpUrl.build())
.method("PUT", body)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Content-Type", "application/json")
@@ -369,13 +381,13 @@ public CompletableFuture> update
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), UpdateApiKeyResponse.class),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, UpdateApiKeyResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 400:
@@ -407,11 +419,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -432,13 +442,17 @@ public CompletableFuture> delete
public CompletableFuture> deleteApiKey(
String apiKeyId, RequestOptions requestOptions) {
- HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("api-keys")
- .addPathSegment(apiKeyId)
- .build();
+ .addPathSegment(apiKeyId);
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
Request okhttpRequest = new Request.Builder()
- .url(httpUrl)
+ .url(httpUrl.build())
.method("DELETE", null)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Accept", "application/json")
@@ -452,13 +466,13 @@ public CompletableFuture> delete
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), DeleteApiKeyResponse.class),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, DeleteApiKeyResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 400:
@@ -490,11 +504,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -532,110 +544,10 @@ public CompletableFuture> countA
QueryStringMapper.addQueryParameter(
httpUrl, "offset", request.getOffset().get(), false);
}
- Request.Builder _requestBuilder = new Request.Builder()
- .url(httpUrl.build())
- .method("GET", null)
- .headers(Headers.of(clientOptions.headers(requestOptions)))
- .addHeader("Accept", "application/json");
- Request okhttpRequest = _requestBuilder.build();
- OkHttpClient client = clientOptions.httpClient();
- if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
- client = clientOptions.httpClientWithTimeout(requestOptions);
- }
- CompletableFuture> future = new CompletableFuture<>();
- client.newCall(okhttpRequest).enqueue(new Callback() {
- @Override
- public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
- try (ResponseBody responseBody = response.body()) {
- if (response.isSuccessful()) {
- future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), CountApiKeysResponse.class),
- response));
- return;
- }
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
- try {
- switch (response.code()) {
- case 400:
- future.completeExceptionally(new BadRequestError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- case 401:
- future.completeExceptionally(new UnauthorizedError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- case 403:
- future.completeExceptionally(new ForbiddenError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- case 404:
- future.completeExceptionally(new NotFoundError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- case 500:
- future.completeExceptionally(new InternalServerError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- }
- } catch (JsonProcessingException ignored) {
- // unable to map error response, throwing generic error
- }
- future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
- return;
- } catch (IOException e) {
- future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
- }
- }
-
- @Override
- public void onFailure(@NotNull Call call, @NotNull IOException e) {
- future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
- }
- });
- return future;
- }
-
- public CompletableFuture> listApiRequests() {
- return listApiRequests(ListApiRequestsRequest.builder().build());
- }
-
- public CompletableFuture> listApiRequests(
- ListApiRequestsRequest request) {
- return listApiRequests(request, null);
- }
-
- public CompletableFuture> listApiRequests(
- ListApiRequestsRequest request, RequestOptions requestOptions) {
- HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
- .newBuilder()
- .addPathSegments("api-requests");
- if (request.getQ().isPresent()) {
- QueryStringMapper.addQueryParameter(httpUrl, "q", request.getQ().get(), false);
- }
- if (request.getRequestType().isPresent()) {
- QueryStringMapper.addQueryParameter(
- httpUrl, "request_type", request.getRequestType().get(), false);
- }
- if (request.getEnvironmentId().isPresent()) {
- QueryStringMapper.addQueryParameter(
- httpUrl, "environment_id", request.getEnvironmentId().get(), false);
- }
- if (request.getLimit().isPresent()) {
- QueryStringMapper.addQueryParameter(
- httpUrl, "limit", request.getLimit().get(), false);
- }
- if (request.getOffset().isPresent()) {
- QueryStringMapper.addQueryParameter(
- httpUrl, "offset", request.getOffset().get(), false);
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
}
Request.Builder _requestBuilder = new Request.Builder()
.url(httpUrl.build())
@@ -647,203 +559,18 @@ public CompletableFuture> lis
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
client = clientOptions.httpClientWithTimeout(requestOptions);
}
- CompletableFuture> future = new CompletableFuture<>();
- client.newCall(okhttpRequest).enqueue(new Callback() {
- @Override
- public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
- try (ResponseBody responseBody = response.body()) {
- if (response.isSuccessful()) {
- future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(
- responseBody.string(), ListApiRequestsResponse.class),
- response));
- return;
- }
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
- try {
- switch (response.code()) {
- case 400:
- future.completeExceptionally(new BadRequestError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- case 401:
- future.completeExceptionally(new UnauthorizedError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- case 403:
- future.completeExceptionally(new ForbiddenError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- case 404:
- future.completeExceptionally(new NotFoundError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- case 500:
- future.completeExceptionally(new InternalServerError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- }
- } catch (JsonProcessingException ignored) {
- // unable to map error response, throwing generic error
- }
- future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
- return;
- } catch (IOException e) {
- future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
- }
- }
-
- @Override
- public void onFailure(@NotNull Call call, @NotNull IOException e) {
- future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
- }
- });
- return future;
- }
-
- public CompletableFuture> getApiRequest(String apiRequestId) {
- return getApiRequest(apiRequestId, null);
- }
-
- public CompletableFuture> getApiRequest(
- String apiRequestId, RequestOptions requestOptions) {
- HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
- .newBuilder()
- .addPathSegments("api-requests")
- .addPathSegment(apiRequestId)
- .build();
- Request okhttpRequest = new Request.Builder()
- .url(httpUrl)
- .method("GET", null)
- .headers(Headers.of(clientOptions.headers(requestOptions)))
- .addHeader("Accept", "application/json")
- .build();
- OkHttpClient client = clientOptions.httpClient();
- if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
- client = clientOptions.httpClientWithTimeout(requestOptions);
- }
- CompletableFuture> future = new CompletableFuture<>();
+ CompletableFuture> future = new CompletableFuture<>();
client.newCall(okhttpRequest).enqueue(new Callback() {
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
- if (response.isSuccessful()) {
- future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetApiRequestResponse.class),
- response));
- return;
- }
String responseBodyString = responseBody != null ? responseBody.string() : "{}";
- try {
- switch (response.code()) {
- case 401:
- future.completeExceptionally(new UnauthorizedError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- case 403:
- future.completeExceptionally(new ForbiddenError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- case 404:
- future.completeExceptionally(new NotFoundError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- case 500:
- future.completeExceptionally(new InternalServerError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class),
- response));
- return;
- }
- } catch (JsonProcessingException ignored) {
- // unable to map error response, throwing generic error
- }
- future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
- return;
- } catch (IOException e) {
- future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
- }
- }
-
- @Override
- public void onFailure(@NotNull Call call, @NotNull IOException e) {
- future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
- }
- });
- return future;
- }
-
- public CompletableFuture> countApiRequests() {
- return countApiRequests(CountApiRequestsRequest.builder().build());
- }
-
- public CompletableFuture> countApiRequests(
- CountApiRequestsRequest request) {
- return countApiRequests(request, null);
- }
-
- public CompletableFuture> countApiRequests(
- CountApiRequestsRequest request, RequestOptions requestOptions) {
- HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
- .newBuilder()
- .addPathSegments("api-requests/count");
- if (request.getQ().isPresent()) {
- QueryStringMapper.addQueryParameter(httpUrl, "q", request.getQ().get(), false);
- }
- if (request.getRequestType().isPresent()) {
- QueryStringMapper.addQueryParameter(
- httpUrl, "request_type", request.getRequestType().get(), false);
- }
- if (request.getEnvironmentId().isPresent()) {
- QueryStringMapper.addQueryParameter(
- httpUrl, "environment_id", request.getEnvironmentId().get(), false);
- }
- if (request.getLimit().isPresent()) {
- QueryStringMapper.addQueryParameter(
- httpUrl, "limit", request.getLimit().get(), false);
- }
- if (request.getOffset().isPresent()) {
- QueryStringMapper.addQueryParameter(
- httpUrl, "offset", request.getOffset().get(), false);
- }
- Request.Builder _requestBuilder = new Request.Builder()
- .url(httpUrl.build())
- .method("GET", null)
- .headers(Headers.of(clientOptions.headers(requestOptions)))
- .addHeader("Accept", "application/json");
- Request okhttpRequest = _requestBuilder.build();
- OkHttpClient client = clientOptions.httpClient();
- if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
- client = clientOptions.httpClientWithTimeout(requestOptions);
- }
- CompletableFuture> future = new CompletableFuture<>();
- client.newCall(okhttpRequest).enqueue(new Callback() {
- @Override
- public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
- try (ResponseBody responseBody = response.body()) {
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(
- responseBody.string(), CountApiRequestsResponse.class),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, CountApiKeysResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 400:
@@ -875,11 +602,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -898,6 +623,11 @@ public CompletableFuture> listA
return listAuditLogs(ListAuditLogsRequest.builder().build());
}
+ public CompletableFuture> listAuditLogs(
+ RequestOptions requestOptions) {
+ return listAuditLogs(ListAuditLogsRequest.builder().build(), requestOptions);
+ }
+
public CompletableFuture> listAuditLogs(
ListAuditLogsRequest request) {
return listAuditLogs(request, null);
@@ -912,6 +642,10 @@ public CompletableFuture> listA
QueryStringMapper.addQueryParameter(
httpUrl, "actor_type", request.getActorType().get(), false);
}
+ if (request.getEndTime().isPresent()) {
+ QueryStringMapper.addQueryParameter(
+ httpUrl, "end_time", request.getEndTime().get(), false);
+ }
if (request.getEnvironmentId().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "environment_id", request.getEnvironmentId().get(), false);
@@ -919,6 +653,10 @@ public CompletableFuture> listA
if (request.getQ().isPresent()) {
QueryStringMapper.addQueryParameter(httpUrl, "q", request.getQ().get(), false);
}
+ if (request.getStartTime().isPresent()) {
+ QueryStringMapper.addQueryParameter(
+ httpUrl, "start_time", request.getStartTime().get(), false);
+ }
if (request.getLimit().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "limit", request.getLimit().get(), false);
@@ -927,6 +665,11 @@ public CompletableFuture> listA
QueryStringMapper.addQueryParameter(
httpUrl, "offset", request.getOffset().get(), false);
}
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
Request.Builder _requestBuilder = new Request.Builder()
.url(httpUrl.build())
.method("GET", null)
@@ -942,13 +685,13 @@ public CompletableFuture> listA
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ListAuditLogsResponse.class),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ListAuditLogsResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 400:
@@ -980,11 +723,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -1005,13 +746,17 @@ public CompletableFuture> getAudi
public CompletableFuture> getAuditLog(
String auditLogId, RequestOptions requestOptions) {
- HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("audit-log")
- .addPathSegment(auditLogId)
- .build();
+ .addPathSegment(auditLogId);
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
Request okhttpRequest = new Request.Builder()
- .url(httpUrl)
+ .url(httpUrl.build())
.method("GET", null)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Accept", "application/json")
@@ -1025,13 +770,13 @@ public CompletableFuture> getAudi
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetAuditLogResponse.class),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, GetAuditLogResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 401:
@@ -1058,11 +803,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -1081,6 +824,11 @@ public CompletableFuture> coun
return countAuditLogs(CountAuditLogsRequest.builder().build());
}
+ public CompletableFuture> countAuditLogs(
+ RequestOptions requestOptions) {
+ return countAuditLogs(CountAuditLogsRequest.builder().build(), requestOptions);
+ }
+
public CompletableFuture> countAuditLogs(
CountAuditLogsRequest request) {
return countAuditLogs(request, null);
@@ -1095,6 +843,10 @@ public CompletableFuture> coun
QueryStringMapper.addQueryParameter(
httpUrl, "actor_type", request.getActorType().get(), false);
}
+ if (request.getEndTime().isPresent()) {
+ QueryStringMapper.addQueryParameter(
+ httpUrl, "end_time", request.getEndTime().get(), false);
+ }
if (request.getEnvironmentId().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "environment_id", request.getEnvironmentId().get(), false);
@@ -1102,6 +854,10 @@ public CompletableFuture> coun
if (request.getQ().isPresent()) {
QueryStringMapper.addQueryParameter(httpUrl, "q", request.getQ().get(), false);
}
+ if (request.getStartTime().isPresent()) {
+ QueryStringMapper.addQueryParameter(
+ httpUrl, "start_time", request.getStartTime().get(), false);
+ }
if (request.getLimit().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "limit", request.getLimit().get(), false);
@@ -1110,6 +866,11 @@ public CompletableFuture> coun
QueryStringMapper.addQueryParameter(
httpUrl, "offset", request.getOffset().get(), false);
}
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
Request.Builder _requestBuilder = new Request.Builder()
.url(httpUrl.build())
.method("GET", null)
@@ -1125,14 +886,13 @@ public CompletableFuture> coun
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(
- responseBody.string(), CountAuditLogsResponse.class),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, CountAuditLogsResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 400:
@@ -1164,11 +924,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -1187,6 +945,11 @@ public CompletableFuture> li
return listEnvironments(ListEnvironmentsRequest.builder().build());
}
+ public CompletableFuture> listEnvironments(
+ RequestOptions requestOptions) {
+ return listEnvironments(ListEnvironmentsRequest.builder().build(), requestOptions);
+ }
+
public CompletableFuture> listEnvironments(
ListEnvironmentsRequest request) {
return listEnvironments(request, null);
@@ -1208,6 +971,11 @@ public CompletableFuture> li
if (request.getIds().isPresent()) {
QueryStringMapper.addQueryParameter(httpUrl, "ids", request.getIds().get(), true);
}
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
Request.Builder _requestBuilder = new Request.Builder()
.url(httpUrl.build())
.method("GET", null)
@@ -1223,14 +991,13 @@ public CompletableFuture> li
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(
- responseBody.string(), ListEnvironmentsResponse.class),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ListEnvironmentsResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 400:
@@ -1262,11 +1029,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -1288,10 +1053,14 @@ public CompletableFuture> c
public CompletableFuture> createEnvironment(
CreateEnvironmentRequestBody request, RequestOptions requestOptions) {
- HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("environments")
- .build();
+ .addPathSegments("environments");
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
RequestBody body;
try {
body = RequestBody.create(
@@ -1300,7 +1069,7 @@ public CompletableFuture> c
throw new BaseSchematicException("Failed to serialize request", e);
}
Request okhttpRequest = new Request.Builder()
- .url(httpUrl)
+ .url(httpUrl.build())
.method("POST", body)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Content-Type", "application/json")
@@ -1315,14 +1084,14 @@ public CompletableFuture> c
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
ObjectMappers.JSON_MAPPER.readValue(
- responseBody.string(), CreateEnvironmentResponse.class),
+ responseBodyString, CreateEnvironmentResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 400:
@@ -1354,11 +1123,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -1379,13 +1146,17 @@ public CompletableFuture> getE
public CompletableFuture> getEnvironment(
String environmentId, RequestOptions requestOptions) {
- HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("environments")
- .addPathSegment(environmentId)
- .build();
+ .addPathSegment(environmentId);
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
Request okhttpRequest = new Request.Builder()
- .url(httpUrl)
+ .url(httpUrl.build())
.method("GET", null)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Accept", "application/json")
@@ -1399,14 +1170,13 @@ public CompletableFuture> getE
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(
- responseBody.string(), GetEnvironmentResponse.class),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, GetEnvironmentResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 401:
@@ -1433,11 +1203,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -1458,6 +1226,12 @@ public CompletableFuture> u
environmentId, UpdateEnvironmentRequestBody.builder().build());
}
+ public CompletableFuture> updateEnvironment(
+ String environmentId, RequestOptions requestOptions) {
+ return updateEnvironment(
+ environmentId, UpdateEnvironmentRequestBody.builder().build(), requestOptions);
+ }
+
public CompletableFuture> updateEnvironment(
String environmentId, UpdateEnvironmentRequestBody request) {
return updateEnvironment(environmentId, request, null);
@@ -1465,11 +1239,15 @@ public CompletableFuture> u
public CompletableFuture> updateEnvironment(
String environmentId, UpdateEnvironmentRequestBody request, RequestOptions requestOptions) {
- HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("environments")
- .addPathSegment(environmentId)
- .build();
+ .addPathSegment(environmentId);
+ if (requestOptions != null) {
+ requestOptions.getQueryParameters().forEach((_key, _value) -> {
+ httpUrl.addQueryParameter(_key, _value);
+ });
+ }
RequestBody body;
try {
body = RequestBody.create(
@@ -1478,7 +1256,7 @@ public CompletableFuture> u
throw new BaseSchematicException("Failed to serialize request", e);
}
Request okhttpRequest = new Request.Builder()
- .url(httpUrl)
+ .url(httpUrl.build())
.method("PUT", body)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Content-Type", "application/json")
@@ -1493,14 +1271,14 @@ public CompletableFuture> u
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
if (response.isSuccessful()) {
future.complete(new BaseSchematicHttpResponse<>(
ObjectMappers.JSON_MAPPER.readValue(
- responseBody.string(), UpdateEnvironmentResponse.class),
+ responseBodyString, UpdateEnvironmentResponse.class),
response));
return;
}
- String responseBodyString = responseBody != null ? responseBody.string() : "{}";
try {
switch (response.code()) {
case 400:
@@ -1532,11 +1310,9 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (JsonProcessingException ignored) {
// unable to map error response, throwing generic error
}
+ Object errorBody = ObjectMappers.parseErrorBody(responseBodyString);
future.completeExceptionally(new BaseSchematicApiException(
- "Error with status code " + response.code(),
- response.code(),
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
+ "Error with status code " + response.code(), response.code(), errorBody, response));
return;
} catch (IOException e) {
future.completeExceptionally(new BaseSchematicException("Network error executing HTTP request", e));
@@ -1558,13 +1334,17 @@ public CompletableFuture> d
public CompletableFuture