From 4480a779ac0154b6f355731e3c5cafb885f53549 Mon Sep 17 00:00:00 2001 From: polytomic-sdk-bot Date: Tue, 18 Jun 2024 19:53:16 +0000 Subject: [PATCH] Release 1.4.0 --- build.gradle | 2 +- .../com/polytomic/api/core/ClientOptions.java | 2 +- .../requests/CreateBulkSyncRequest.java | 58 +++++++++---------- .../requests/UpdateBulkSyncRequest.java | 58 +++++++++---------- .../CreateConnectionRequestSchema.java | 30 ++++++---- .../UpdateConnectionRequestSchema.java | 30 ++++++---- .../api/resources/models/ModelsClient.java | 4 +- .../models/requests/UpdateModelRequest.java | 30 ++++++---- .../requests/CreateModelSyncRequest.java | 30 ++++++---- .../requests/UpdateModelSyncRequest.java | 30 ++++++---- .../api/types/CreateModelRequest.java | 30 ++++++---- .../polytomic/api/types/ExecutionCounts.java | 30 +++++++++- 12 files changed, 208 insertions(+), 126 deletions(-) diff --git a/build.gradle b/build.gradle index 13feef2..2ce264e 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ publishing { maven(MavenPublication) { groupId = 'com.polytomic' artifactId = 'polytomic-java' - version = '1.3.0' + version = '1.4.0' from components.java } } diff --git a/src/main/java/com/polytomic/api/core/ClientOptions.java b/src/main/java/com/polytomic/api/core/ClientOptions.java index 94f3cbd..35b020b 100644 --- a/src/main/java/com/polytomic/api/core/ClientOptions.java +++ b/src/main/java/com/polytomic/api/core/ClientOptions.java @@ -29,7 +29,7 @@ private ClientOptions( "X-Fern-SDK-Name", "com.polytomic.fern:api-sdk", "X-Fern-SDK-Version", - "1.3.0", + "1.4.0", "X-Fern-Language", "JAVA")); this.headerSuppliers = headerSuppliers; diff --git a/src/main/java/com/polytomic/api/resources/bulksync/requests/CreateBulkSyncRequest.java b/src/main/java/com/polytomic/api/resources/bulksync/requests/CreateBulkSyncRequest.java index 78583d8..547e0f2 100644 --- a/src/main/java/com/polytomic/api/resources/bulksync/requests/CreateBulkSyncRequest.java +++ b/src/main/java/com/polytomic/api/resources/bulksync/requests/CreateBulkSyncRequest.java @@ -37,7 +37,7 @@ public final class CreateBulkSyncRequest { private final Optional discover; - private final Optional mode; + private final String mode; private final String name; @@ -63,7 +63,7 @@ private CreateBulkSyncRequest( String destinationConnectionId, Optional disableRecordTimestamps, Optional discover, - Optional mode, + String mode, String name, Optional organizationId, Optional> policies, @@ -129,10 +129,10 @@ public Optional getDiscover() { } /** - * @return + * @return Either 'replicate' or 'snapshot'. */ @JsonProperty("mode") - public Optional getMode() { + public String getMode() { return mode; } @@ -230,11 +230,15 @@ public static DestinationConnectionIdStage builder() { } public interface DestinationConnectionIdStage { - NameStage destinationConnectionId(String destinationConnectionId); + ModeStage destinationConnectionId(String destinationConnectionId); Builder from(CreateBulkSyncRequest other); } + public interface ModeStage { + NameStage mode(String mode); + } + public interface NameStage { ScheduleStage name(String name); } @@ -274,10 +278,6 @@ public interface _FinalStage { _FinalStage discover(Boolean discover); - _FinalStage mode(Optional mode); - - _FinalStage mode(String mode); - _FinalStage organizationId(Optional organizationId); _FinalStage organizationId(String organizationId); @@ -297,9 +297,16 @@ public interface _FinalStage { @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder - implements DestinationConnectionIdStage, NameStage, ScheduleStage, SourceConnectionIdStage, _FinalStage { + implements DestinationConnectionIdStage, + ModeStage, + NameStage, + ScheduleStage, + SourceConnectionIdStage, + _FinalStage { private String destinationConnectionId; + private String mode; + private String name; private BulkSchedule schedule; @@ -314,8 +321,6 @@ public static final class Builder private Optional organizationId = Optional.empty(); - private Optional mode = Optional.empty(); - private Optional discover = Optional.empty(); private Optional disableRecordTimestamps = Optional.empty(); @@ -355,11 +360,22 @@ public Builder from(CreateBulkSyncRequest other) { @java.lang.Override @JsonSetter("destination_connection_id") - public NameStage destinationConnectionId(String destinationConnectionId) { + public ModeStage destinationConnectionId(String destinationConnectionId) { this.destinationConnectionId = destinationConnectionId; return this; } + /** + *

Either 'replicate' or 'snapshot'.

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + @JsonSetter("mode") + public NameStage mode(String mode) { + this.mode = mode; + return this; + } + @java.lang.Override @JsonSetter("name") public ScheduleStage name(String name) { @@ -433,22 +449,6 @@ public _FinalStage organizationId(Optional organizationId) { return this; } - /** - * @return Reference to {@code this} so that method calls can be chained together. - */ - @java.lang.Override - public _FinalStage mode(String mode) { - this.mode = Optional.of(mode); - return this; - } - - @java.lang.Override - @JsonSetter(value = "mode", nulls = Nulls.SKIP) - public _FinalStage mode(Optional mode) { - this.mode = mode; - return this; - } - /** *

DEPRECATED: Use automatically_add_new_objects/automatically_add_new_fields instead

* @return Reference to {@code this} so that method calls can be chained together. diff --git a/src/main/java/com/polytomic/api/resources/bulksync/requests/UpdateBulkSyncRequest.java b/src/main/java/com/polytomic/api/resources/bulksync/requests/UpdateBulkSyncRequest.java index 611b606..2b06221 100644 --- a/src/main/java/com/polytomic/api/resources/bulksync/requests/UpdateBulkSyncRequest.java +++ b/src/main/java/com/polytomic/api/resources/bulksync/requests/UpdateBulkSyncRequest.java @@ -37,7 +37,7 @@ public final class UpdateBulkSyncRequest { private final Optional discover; - private final Optional mode; + private final String mode; private final String name; @@ -63,7 +63,7 @@ private UpdateBulkSyncRequest( String destinationConnectionId, Optional disableRecordTimestamps, Optional discover, - Optional mode, + String mode, String name, Optional organizationId, Optional> policies, @@ -129,10 +129,10 @@ public Optional getDiscover() { } /** - * @return + * @return Either 'replicate' or 'snapshot'. */ @JsonProperty("mode") - public Optional getMode() { + public String getMode() { return mode; } @@ -230,11 +230,15 @@ public static DestinationConnectionIdStage builder() { } public interface DestinationConnectionIdStage { - NameStage destinationConnectionId(String destinationConnectionId); + ModeStage destinationConnectionId(String destinationConnectionId); Builder from(UpdateBulkSyncRequest other); } + public interface ModeStage { + NameStage mode(String mode); + } + public interface NameStage { ScheduleStage name(String name); } @@ -274,10 +278,6 @@ public interface _FinalStage { _FinalStage discover(Boolean discover); - _FinalStage mode(Optional mode); - - _FinalStage mode(String mode); - _FinalStage organizationId(Optional organizationId); _FinalStage organizationId(String organizationId); @@ -297,9 +297,16 @@ public interface _FinalStage { @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder - implements DestinationConnectionIdStage, NameStage, ScheduleStage, SourceConnectionIdStage, _FinalStage { + implements DestinationConnectionIdStage, + ModeStage, + NameStage, + ScheduleStage, + SourceConnectionIdStage, + _FinalStage { private String destinationConnectionId; + private String mode; + private String name; private BulkSchedule schedule; @@ -314,8 +321,6 @@ public static final class Builder private Optional organizationId = Optional.empty(); - private Optional mode = Optional.empty(); - private Optional discover = Optional.empty(); private Optional disableRecordTimestamps = Optional.empty(); @@ -355,11 +360,22 @@ public Builder from(UpdateBulkSyncRequest other) { @java.lang.Override @JsonSetter("destination_connection_id") - public NameStage destinationConnectionId(String destinationConnectionId) { + public ModeStage destinationConnectionId(String destinationConnectionId) { this.destinationConnectionId = destinationConnectionId; return this; } + /** + *

Either 'replicate' or 'snapshot'.

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + @JsonSetter("mode") + public NameStage mode(String mode) { + this.mode = mode; + return this; + } + @java.lang.Override @JsonSetter("name") public ScheduleStage name(String name) { @@ -433,22 +449,6 @@ public _FinalStage organizationId(Optional organizationId) { return this; } - /** - * @return Reference to {@code this} so that method calls can be chained together. - */ - @java.lang.Override - public _FinalStage mode(String mode) { - this.mode = Optional.of(mode); - return this; - } - - @java.lang.Override - @JsonSetter(value = "mode", nulls = Nulls.SKIP) - public _FinalStage mode(Optional mode) { - this.mode = mode; - return this; - } - /** *

DEPRECATED: Use automatically_add_new_objects/automatically_add_new_fields instead

* @return Reference to {@code this} so that method calls can be chained together. diff --git a/src/main/java/com/polytomic/api/resources/connections/requests/CreateConnectionRequestSchema.java b/src/main/java/com/polytomic/api/resources/connections/requests/CreateConnectionRequestSchema.java index 7c443d6..a6d344c 100644 --- a/src/main/java/com/polytomic/api/resources/connections/requests/CreateConnectionRequestSchema.java +++ b/src/main/java/com/polytomic/api/resources/connections/requests/CreateConnectionRequestSchema.java @@ -13,6 +13,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.polytomic.api.core.ObjectMappers; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -21,7 +22,7 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonDeserialize(builder = CreateConnectionRequestSchema.Builder.class) public final class CreateConnectionRequestSchema { - private final Optional> configuration; + private final Map configuration; private final String name; @@ -38,7 +39,7 @@ public final class CreateConnectionRequestSchema { private final Map additionalProperties; private CreateConnectionRequestSchema( - Optional> configuration, + Map configuration, String name, Optional organizationId, Optional> policies, @@ -57,7 +58,7 @@ private CreateConnectionRequestSchema( } @JsonProperty("configuration") - public Optional> getConfiguration() { + public Map getConfiguration() { return configuration; } @@ -152,10 +153,12 @@ public interface TypeStage { public interface _FinalStage { CreateConnectionRequestSchema build(); - _FinalStage configuration(Optional> configuration); - _FinalStage configuration(Map configuration); + _FinalStage putAllConfiguration(Map configuration); + + _FinalStage configuration(String key, Object value); + _FinalStage organizationId(Optional organizationId); _FinalStage organizationId(String organizationId); @@ -187,7 +190,7 @@ public static final class Builder implements NameStage, TypeStage, _FinalStage { private Optional organizationId = Optional.empty(); - private Optional> configuration = Optional.empty(); + private Map configuration = new LinkedHashMap<>(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -281,15 +284,22 @@ public _FinalStage organizationId(Optional organizationId) { } @java.lang.Override - public _FinalStage configuration(Map configuration) { - this.configuration = Optional.of(configuration); + public _FinalStage configuration(String key, Object value) { + this.configuration.put(key, value); + return this; + } + + @java.lang.Override + public _FinalStage putAllConfiguration(Map configuration) { + this.configuration.putAll(configuration); return this; } @java.lang.Override @JsonSetter(value = "configuration", nulls = Nulls.SKIP) - public _FinalStage configuration(Optional> configuration) { - this.configuration = configuration; + public _FinalStage configuration(Map configuration) { + this.configuration.clear(); + this.configuration.putAll(configuration); return this; } diff --git a/src/main/java/com/polytomic/api/resources/connections/requests/UpdateConnectionRequestSchema.java b/src/main/java/com/polytomic/api/resources/connections/requests/UpdateConnectionRequestSchema.java index 507df5f..9a66074 100644 --- a/src/main/java/com/polytomic/api/resources/connections/requests/UpdateConnectionRequestSchema.java +++ b/src/main/java/com/polytomic/api/resources/connections/requests/UpdateConnectionRequestSchema.java @@ -13,6 +13,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.polytomic.api.core.ObjectMappers; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -21,7 +22,7 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonDeserialize(builder = UpdateConnectionRequestSchema.Builder.class) public final class UpdateConnectionRequestSchema { - private final Optional> configuration; + private final Map configuration; private final String name; @@ -38,7 +39,7 @@ public final class UpdateConnectionRequestSchema { private final Map additionalProperties; private UpdateConnectionRequestSchema( - Optional> configuration, + Map configuration, String name, Optional organizationId, Optional> policies, @@ -57,7 +58,7 @@ private UpdateConnectionRequestSchema( } @JsonProperty("configuration") - public Optional> getConfiguration() { + public Map getConfiguration() { return configuration; } @@ -145,10 +146,12 @@ public interface NameStage { public interface _FinalStage { UpdateConnectionRequestSchema build(); - _FinalStage configuration(Optional> configuration); - _FinalStage configuration(Map configuration); + _FinalStage putAllConfiguration(Map configuration); + + _FinalStage configuration(String key, Object value); + _FinalStage organizationId(Optional organizationId); _FinalStage organizationId(String organizationId); @@ -184,7 +187,7 @@ public static final class Builder implements NameStage, _FinalStage { private Optional organizationId = Optional.empty(); - private Optional> configuration = Optional.empty(); + private Map configuration = new LinkedHashMap<>(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -280,15 +283,22 @@ public _FinalStage organizationId(Optional organizationId) { } @java.lang.Override - public _FinalStage configuration(Map configuration) { - this.configuration = Optional.of(configuration); + public _FinalStage configuration(String key, Object value) { + this.configuration.put(key, value); + return this; + } + + @java.lang.Override + public _FinalStage putAllConfiguration(Map configuration) { + this.configuration.putAll(configuration); return this; } @java.lang.Override @JsonSetter(value = "configuration", nulls = Nulls.SKIP) - public _FinalStage configuration(Optional> configuration) { - this.configuration = configuration; + public _FinalStage configuration(Map configuration) { + this.configuration.clear(); + this.configuration.putAll(configuration); return this; } diff --git a/src/main/java/com/polytomic/api/resources/models/ModelsClient.java b/src/main/java/com/polytomic/api/resources/models/ModelsClient.java index ddad252..b86cea4 100644 --- a/src/main/java/com/polytomic/api/resources/models/ModelsClient.java +++ b/src/main/java/com/polytomic/api/resources/models/ModelsClient.java @@ -246,9 +246,7 @@ public ModelResponseEnvelope update(String id, UpdateModelRequest request, Reque if (request.getAdditionalFields().isPresent()) { properties.put("additional_fields", request.getAdditionalFields()); } - if (request.getConfiguration().isPresent()) { - properties.put("configuration", request.getConfiguration()); - } + properties.put("configuration", request.getConfiguration()); properties.put("connection_id", request.getConnectionId()); if (request.getEnricher().isPresent()) { properties.put("enricher", request.getEnricher()); diff --git a/src/main/java/com/polytomic/api/resources/models/requests/UpdateModelRequest.java b/src/main/java/com/polytomic/api/resources/models/requests/UpdateModelRequest.java index fc5c236..9b5454b 100644 --- a/src/main/java/com/polytomic/api/resources/models/requests/UpdateModelRequest.java +++ b/src/main/java/com/polytomic/api/resources/models/requests/UpdateModelRequest.java @@ -16,6 +16,7 @@ import com.polytomic.api.types.ModelModelFieldRequest; import com.polytomic.api.types.ModelRelation; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -28,7 +29,7 @@ public final class UpdateModelRequest { private final Optional> additionalFields; - private final Optional> configuration; + private final Map configuration; private final String connectionId; @@ -55,7 +56,7 @@ public final class UpdateModelRequest { private UpdateModelRequest( Optional async, Optional> additionalFields, - Optional> configuration, + Map configuration, String connectionId, Optional enricher, Optional> fields, @@ -94,7 +95,7 @@ public Optional> getAdditionalFields() { } @JsonProperty("configuration") - public Optional> getConfiguration() { + public Map getConfiguration() { return configuration; } @@ -223,10 +224,12 @@ public interface _FinalStage { _FinalStage additionalFields(List additionalFields); - _FinalStage configuration(Optional> configuration); - _FinalStage configuration(Map configuration); + _FinalStage putAllConfiguration(Map configuration); + + _FinalStage configuration(String key, Object value); + _FinalStage enricher(Optional enricher); _FinalStage enricher(Enrichment enricher); @@ -282,7 +285,7 @@ public static final class Builder implements ConnectionIdStage, NameStage, _Fina private Optional enricher = Optional.empty(); - private Optional> configuration = Optional.empty(); + private Map configuration = new LinkedHashMap<>(); private Optional> additionalFields = Optional.empty(); @@ -430,15 +433,22 @@ public _FinalStage enricher(Optional enricher) { } @java.lang.Override - public _FinalStage configuration(Map configuration) { - this.configuration = Optional.of(configuration); + public _FinalStage configuration(String key, Object value) { + this.configuration.put(key, value); + return this; + } + + @java.lang.Override + public _FinalStage putAllConfiguration(Map configuration) { + this.configuration.putAll(configuration); return this; } @java.lang.Override @JsonSetter(value = "configuration", nulls = Nulls.SKIP) - public _FinalStage configuration(Optional> configuration) { - this.configuration = configuration; + public _FinalStage configuration(Map configuration) { + this.configuration.clear(); + this.configuration.putAll(configuration); return this; } diff --git a/src/main/java/com/polytomic/api/resources/modelsync/requests/CreateModelSyncRequest.java b/src/main/java/com/polytomic/api/resources/modelsync/requests/CreateModelSyncRequest.java index ee2cc3b..8412168 100644 --- a/src/main/java/com/polytomic/api/resources/modelsync/requests/CreateModelSyncRequest.java +++ b/src/main/java/com/polytomic/api/resources/modelsync/requests/CreateModelSyncRequest.java @@ -19,6 +19,7 @@ import com.polytomic.api.types.Override; import com.polytomic.api.types.Schedule; import com.polytomic.api.types.Target; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -32,7 +33,7 @@ public final class CreateModelSyncRequest { private final Optional enricher; - private final Optional> fields; + private final List fields; private final Optional filterLogic; @@ -63,7 +64,7 @@ public final class CreateModelSyncRequest { private CreateModelSyncRequest( Optional active, Optional enricher, - Optional> fields, + List fields, Optional filterLogic, Optional> filters, Optional identity, @@ -106,7 +107,7 @@ public Optional getEnricher() { } @JsonProperty("fields") - public Optional> getFields() { + public List getFields() { return fields; } @@ -263,10 +264,12 @@ public interface _FinalStage { _FinalStage enricher(Enrichment enricher); - _FinalStage fields(Optional> fields); - _FinalStage fields(List fields); + _FinalStage addFields(ModelSyncField fields); + + _FinalStage addAllFields(List fields); + _FinalStage filterLogic(Optional filterLogic); _FinalStage filterLogic(String filterLogic); @@ -326,7 +329,7 @@ public static final class Builder implements ModeStage, NameStage, ScheduleStage private Optional filterLogic = Optional.empty(); - private Optional> fields = Optional.empty(); + private List fields = new ArrayList<>(); private Optional enricher = Optional.empty(); @@ -498,15 +501,22 @@ public _FinalStage filterLogic(Optional filterLogic) { } @java.lang.Override - public _FinalStage fields(List fields) { - this.fields = Optional.of(fields); + public _FinalStage addAllFields(List fields) { + this.fields.addAll(fields); + return this; + } + + @java.lang.Override + public _FinalStage addFields(ModelSyncField fields) { + this.fields.add(fields); return this; } @java.lang.Override @JsonSetter(value = "fields", nulls = Nulls.SKIP) - public _FinalStage fields(Optional> fields) { - this.fields = fields; + public _FinalStage fields(List fields) { + this.fields.clear(); + this.fields.addAll(fields); return this; } diff --git a/src/main/java/com/polytomic/api/resources/modelsync/requests/UpdateModelSyncRequest.java b/src/main/java/com/polytomic/api/resources/modelsync/requests/UpdateModelSyncRequest.java index 471aec6..10fd6f4 100644 --- a/src/main/java/com/polytomic/api/resources/modelsync/requests/UpdateModelSyncRequest.java +++ b/src/main/java/com/polytomic/api/resources/modelsync/requests/UpdateModelSyncRequest.java @@ -19,6 +19,7 @@ import com.polytomic.api.types.Override; import com.polytomic.api.types.Schedule; import com.polytomic.api.types.Target; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -32,7 +33,7 @@ public final class UpdateModelSyncRequest { private final Optional enricher; - private final Optional> fields; + private final List fields; private final Optional filterLogic; @@ -63,7 +64,7 @@ public final class UpdateModelSyncRequest { private UpdateModelSyncRequest( Optional active, Optional enricher, - Optional> fields, + List fields, Optional filterLogic, Optional> filters, Optional identity, @@ -106,7 +107,7 @@ public Optional getEnricher() { } @JsonProperty("fields") - public Optional> getFields() { + public List getFields() { return fields; } @@ -263,10 +264,12 @@ public interface _FinalStage { _FinalStage enricher(Enrichment enricher); - _FinalStage fields(Optional> fields); - _FinalStage fields(List fields); + _FinalStage addFields(ModelSyncField fields); + + _FinalStage addAllFields(List fields); + _FinalStage filterLogic(Optional filterLogic); _FinalStage filterLogic(String filterLogic); @@ -326,7 +329,7 @@ public static final class Builder implements ModeStage, NameStage, ScheduleStage private Optional filterLogic = Optional.empty(); - private Optional> fields = Optional.empty(); + private List fields = new ArrayList<>(); private Optional enricher = Optional.empty(); @@ -498,15 +501,22 @@ public _FinalStage filterLogic(Optional filterLogic) { } @java.lang.Override - public _FinalStage fields(List fields) { - this.fields = Optional.of(fields); + public _FinalStage addAllFields(List fields) { + this.fields.addAll(fields); + return this; + } + + @java.lang.Override + public _FinalStage addFields(ModelSyncField fields) { + this.fields.add(fields); return this; } @java.lang.Override @JsonSetter(value = "fields", nulls = Nulls.SKIP) - public _FinalStage fields(Optional> fields) { - this.fields = fields; + public _FinalStage fields(List fields) { + this.fields.clear(); + this.fields.addAll(fields); return this; } diff --git a/src/main/java/com/polytomic/api/types/CreateModelRequest.java b/src/main/java/com/polytomic/api/types/CreateModelRequest.java index 179d957..e2d3710 100644 --- a/src/main/java/com/polytomic/api/types/CreateModelRequest.java +++ b/src/main/java/com/polytomic/api/types/CreateModelRequest.java @@ -13,6 +13,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.polytomic.api.core.ObjectMappers; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -23,7 +24,7 @@ public final class CreateModelRequest { private final Optional> additionalFields; - private final Optional> configuration; + private final Map configuration; private final String connectionId; @@ -49,7 +50,7 @@ public final class CreateModelRequest { private CreateModelRequest( Optional> additionalFields, - Optional> configuration, + Map configuration, String connectionId, Optional enricher, Optional> fields, @@ -82,7 +83,7 @@ public Optional> getAdditionalFields() { } @JsonProperty("configuration") - public Optional> getConfiguration() { + public Map getConfiguration() { return configuration; } @@ -205,10 +206,12 @@ public interface _FinalStage { _FinalStage additionalFields(List additionalFields); - _FinalStage configuration(Optional> configuration); - _FinalStage configuration(Map configuration); + _FinalStage putAllConfiguration(Map configuration); + + _FinalStage configuration(String key, Object value); + _FinalStage enricher(Optional enricher); _FinalStage enricher(Enrichment enricher); @@ -264,7 +267,7 @@ public static final class Builder implements ConnectionIdStage, NameStage, _Fina private Optional enricher = Optional.empty(); - private Optional> configuration = Optional.empty(); + private Map configuration = new LinkedHashMap<>(); private Optional> additionalFields = Optional.empty(); @@ -409,15 +412,22 @@ public _FinalStage enricher(Optional enricher) { } @java.lang.Override - public _FinalStage configuration(Map configuration) { - this.configuration = Optional.of(configuration); + public _FinalStage configuration(String key, Object value) { + this.configuration.put(key, value); + return this; + } + + @java.lang.Override + public _FinalStage putAllConfiguration(Map configuration) { + this.configuration.putAll(configuration); return this; } @java.lang.Override @JsonSetter(value = "configuration", nulls = Nulls.SKIP) - public _FinalStage configuration(Optional> configuration) { - this.configuration = configuration; + public _FinalStage configuration(Map configuration) { + this.configuration.clear(); + this.configuration.putAll(configuration); return this; } diff --git a/src/main/java/com/polytomic/api/types/ExecutionCounts.java b/src/main/java/com/polytomic/api/types/ExecutionCounts.java index 4d9af53..239fb8d 100644 --- a/src/main/java/com/polytomic/api/types/ExecutionCounts.java +++ b/src/main/java/com/polytomic/api/types/ExecutionCounts.java @@ -20,6 +20,8 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonDeserialize(builder = ExecutionCounts.Builder.class) public final class ExecutionCounts { + private final Optional delete; + private final Optional error; private final Optional insert; @@ -31,11 +33,13 @@ public final class ExecutionCounts { private final Map additionalProperties; private ExecutionCounts( + Optional delete, Optional error, Optional insert, Optional total, Optional update, Map additionalProperties) { + this.delete = delete; this.error = error; this.insert = insert; this.total = total; @@ -43,6 +47,11 @@ private ExecutionCounts( this.additionalProperties = additionalProperties; } + @JsonProperty("delete") + public Optional getDelete() { + return delete; + } + @JsonProperty("error") public Optional getError() { return error; @@ -75,7 +84,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ExecutionCounts other) { - return error.equals(other.error) + return delete.equals(other.delete) + && error.equals(other.error) && insert.equals(other.insert) && total.equals(other.total) && update.equals(other.update); @@ -83,7 +93,7 @@ private boolean equalTo(ExecutionCounts other) { @java.lang.Override public int hashCode() { - return Objects.hash(this.error, this.insert, this.total, this.update); + return Objects.hash(this.delete, this.error, this.insert, this.total, this.update); } @java.lang.Override @@ -97,6 +107,8 @@ public static Builder builder() { @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder { + private Optional delete = Optional.empty(); + private Optional error = Optional.empty(); private Optional insert = Optional.empty(); @@ -111,6 +123,7 @@ public static final class Builder { private Builder() {} public Builder from(ExecutionCounts other) { + delete(other.getDelete()); error(other.getError()); insert(other.getInsert()); total(other.getTotal()); @@ -118,6 +131,17 @@ public Builder from(ExecutionCounts other) { return this; } + @JsonSetter(value = "delete", nulls = Nulls.SKIP) + public Builder delete(Optional delete) { + this.delete = delete; + return this; + } + + public Builder delete(Integer delete) { + this.delete = Optional.of(delete); + return this; + } + @JsonSetter(value = "error", nulls = Nulls.SKIP) public Builder error(Optional error) { this.error = error; @@ -163,7 +187,7 @@ public Builder update(Integer update) { } public ExecutionCounts build() { - return new ExecutionCounts(error, insert, total, update, additionalProperties); + return new ExecutionCounts(delete, error, insert, total, update, additionalProperties); } } }