diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/src/main/java/com/schematic/api/core/ResponseBodyInputStream.java b/src/main/java/com/schematic/api/core/ResponseBodyInputStream.java new file mode 100644 index 0000000..af68eaa --- /dev/null +++ b/src/main/java/com/schematic/api/core/ResponseBodyInputStream.java @@ -0,0 +1,45 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.core; + +import java.io.FilterInputStream; +import java.io.IOException; +import okhttp3.Response; + +/** + * A custom InputStream that wraps the InputStream from the OkHttp Response and ensures that the + * OkHttp Response object is properly closed when the stream is closed. + * + * This class extends FilterInputStream and takes an OkHttp Response object as a parameter. + * It retrieves the InputStream from the Response and overrides the close method to close + * both the InputStream and the Response object, ensuring proper resource management and preventing + * premature closure of the underlying HTTP connection. + */ +public class ResponseBodyInputStream extends FilterInputStream { + private final Response response; + + /** + * Constructs a ResponseBodyInputStream that wraps the InputStream from the given OkHttp + * Response object. + * + * @param response the OkHttp Response object from which the InputStream is retrieved + * @throws IOException if an I/O error occurs while retrieving the InputStream + */ + public ResponseBodyInputStream(Response response) throws IOException { + super(response.body().byteStream()); + this.response = response; + } + + /** + * Closes the InputStream and the associated OkHttp Response object. This ensures that the + * underlying HTTP connection is properly closed after the stream is no longer needed. + * + * @throws IOException if an I/O error occurs + */ + @Override + public void close() throws IOException { + super.close(); + response.close(); // Ensure the response is closed when the stream is closed + } +} diff --git a/src/main/java/com/schematic/api/core/ResponseBodyReader.java b/src/main/java/com/schematic/api/core/ResponseBodyReader.java new file mode 100644 index 0000000..8de8eb3 --- /dev/null +++ b/src/main/java/com/schematic/api/core/ResponseBodyReader.java @@ -0,0 +1,44 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.core; + +import java.io.FilterReader; +import java.io.IOException; +import okhttp3.Response; + +/** + * A custom Reader that wraps the Reader from the OkHttp Response and ensures that the + * OkHttp Response object is properly closed when the reader is closed. + * + * This class extends FilterReader and takes an OkHttp Response object as a parameter. + * It retrieves the Reader from the Response and overrides the close method to close + * both the Reader and the Response object, ensuring proper resource management and preventing + * premature closure of the underlying HTTP connection. + */ +public class ResponseBodyReader extends FilterReader { + private final Response response; + + /** + * Constructs a ResponseBodyReader that wraps the Reader from the given OkHttp Response object. + * + * @param response the OkHttp Response object from which the Reader is retrieved + * @throws IOException if an I/O error occurs while retrieving the Reader + */ + public ResponseBodyReader(Response response) throws IOException { + super(response.body().charStream()); + this.response = response; + } + + /** + * Closes the Reader and the associated OkHttp Response object. This ensures that the + * underlying HTTP connection is properly closed after the reader is no longer needed. + * + * @throws IOException if an I/O error occurs + */ + @Override + public void close() throws IOException { + super.close(); + response.close(); // Ensure the response is closed when the reader is closed + } +} 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 0f5adbf..6722165 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 @@ -17,7 +17,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = IssueTemporaryAccessTokenRequestBody.Builder.class) public final class IssueTemporaryAccessTokenRequestBody { private final Map lookup; 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 9c32e80..428ad88 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 @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = IssueTemporaryAccessTokenResponse.Builder.class) public final class IssueTemporaryAccessTokenResponse { private final IssueTemporaryAccessTokenResponseData data; diff --git a/src/main/java/com/schematic/api/resources/accounts/requests/CountApiKeysRequest.java b/src/main/java/com/schematic/api/resources/accounts/requests/CountApiKeysRequest.java index 31f6373..c305dcc 100644 --- a/src/main/java/com/schematic/api/resources/accounts/requests/CountApiKeysRequest.java +++ b/src/main/java/com/schematic/api/resources/accounts/requests/CountApiKeysRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountApiKeysRequest.Builder.class) public final class CountApiKeysRequest { private final Optional environmentId; @@ -160,7 +160,7 @@ public _FinalStage requireEnvironment(boolean requireEnvironment) { */ @java.lang.Override public _FinalStage offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -177,7 +177,7 @@ public _FinalStage offset(Optional offset) { */ @java.lang.Override public _FinalStage limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -190,7 +190,7 @@ public _FinalStage limit(Optional limit) { @java.lang.Override public _FinalStage environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/requests/CountApiRequestsRequest.java b/src/main/java/com/schematic/api/resources/accounts/requests/CountApiRequestsRequest.java index 069f93c..0af3b86 100644 --- a/src/main/java/com/schematic/api/resources/accounts/requests/CountApiRequestsRequest.java +++ b/src/main/java/com/schematic/api/resources/accounts/requests/CountApiRequestsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountApiRequestsRequest.Builder.class) public final class CountApiRequestsRequest { private final Optional q; @@ -144,7 +144,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -155,7 +155,7 @@ public Builder requestType(Optional requestType) { } public Builder requestType(String requestType) { - this.requestType = Optional.of(requestType); + this.requestType = Optional.ofNullable(requestType); return this; } @@ -166,7 +166,7 @@ public Builder environmentId(Optional environmentId) { } public Builder environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -177,7 +177,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -188,7 +188,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/requests/CreateApiKeyRequestBody.java b/src/main/java/com/schematic/api/resources/accounts/requests/CreateApiKeyRequestBody.java index bc33da2..d36b7f5 100644 --- a/src/main/java/com/schematic/api/resources/accounts/requests/CreateApiKeyRequestBody.java +++ b/src/main/java/com/schematic/api/resources/accounts/requests/CreateApiKeyRequestBody.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateApiKeyRequestBody.Builder.class) public final class CreateApiKeyRequestBody { private final Optional description; @@ -133,7 +133,7 @@ public _FinalStage name(String name) { @java.lang.Override public _FinalStage environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -146,7 +146,7 @@ public _FinalStage environmentId(Optional environmentId) { @java.lang.Override public _FinalStage description(String description) { - this.description = Optional.of(description); + this.description = Optional.ofNullable(description); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/requests/CreateEnvironmentRequestBody.java b/src/main/java/com/schematic/api/resources/accounts/requests/CreateEnvironmentRequestBody.java index 8a72bd2..80bb3cf 100644 --- a/src/main/java/com/schematic/api/resources/accounts/requests/CreateEnvironmentRequestBody.java +++ b/src/main/java/com/schematic/api/resources/accounts/requests/CreateEnvironmentRequestBody.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateEnvironmentRequestBody.Builder.class) public final class CreateEnvironmentRequestBody { private final CreateEnvironmentRequestBodyEnvironmentType environmentType; diff --git a/src/main/java/com/schematic/api/resources/accounts/requests/ListApiKeysRequest.java b/src/main/java/com/schematic/api/resources/accounts/requests/ListApiKeysRequest.java index 94e0e6f..12d61bb 100644 --- a/src/main/java/com/schematic/api/resources/accounts/requests/ListApiKeysRequest.java +++ b/src/main/java/com/schematic/api/resources/accounts/requests/ListApiKeysRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListApiKeysRequest.Builder.class) public final class ListApiKeysRequest { private final Optional environmentId; @@ -160,7 +160,7 @@ public _FinalStage requireEnvironment(boolean requireEnvironment) { */ @java.lang.Override public _FinalStage offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -177,7 +177,7 @@ public _FinalStage offset(Optional offset) { */ @java.lang.Override public _FinalStage limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -190,7 +190,7 @@ public _FinalStage limit(Optional limit) { @java.lang.Override public _FinalStage environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/requests/ListApiRequestsRequest.java b/src/main/java/com/schematic/api/resources/accounts/requests/ListApiRequestsRequest.java index f15d1d3..86e442a 100644 --- a/src/main/java/com/schematic/api/resources/accounts/requests/ListApiRequestsRequest.java +++ b/src/main/java/com/schematic/api/resources/accounts/requests/ListApiRequestsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListApiRequestsRequest.Builder.class) public final class ListApiRequestsRequest { private final Optional q; @@ -144,7 +144,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -155,7 +155,7 @@ public Builder requestType(Optional requestType) { } public Builder requestType(String requestType) { - this.requestType = Optional.of(requestType); + this.requestType = Optional.ofNullable(requestType); return this; } @@ -166,7 +166,7 @@ public Builder environmentId(Optional environmentId) { } public Builder environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -177,7 +177,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -188,7 +188,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/requests/ListEnvironmentsRequest.java b/src/main/java/com/schematic/api/resources/accounts/requests/ListEnvironmentsRequest.java index a627dd2..2aa573c 100644 --- a/src/main/java/com/schematic/api/resources/accounts/requests/ListEnvironmentsRequest.java +++ b/src/main/java/com/schematic/api/resources/accounts/requests/ListEnvironmentsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListEnvironmentsRequest.Builder.class) public final class ListEnvironmentsRequest { private final Optional ids; @@ -116,7 +116,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -127,7 +127,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -138,7 +138,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/requests/UpdateApiKeyRequestBody.java b/src/main/java/com/schematic/api/resources/accounts/requests/UpdateApiKeyRequestBody.java index cdfdbdf..cbf5677 100644 --- a/src/main/java/com/schematic/api/resources/accounts/requests/UpdateApiKeyRequestBody.java +++ b/src/main/java/com/schematic/api/resources/accounts/requests/UpdateApiKeyRequestBody.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateApiKeyRequestBody.Builder.class) public final class UpdateApiKeyRequestBody { private final Optional description; @@ -96,7 +96,7 @@ public Builder description(Optional description) { } public Builder description(String description) { - this.description = Optional.of(description); + this.description = Optional.ofNullable(description); return this; } @@ -107,7 +107,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/requests/UpdateEnvironmentRequestBody.java b/src/main/java/com/schematic/api/resources/accounts/requests/UpdateEnvironmentRequestBody.java index e638e4f..43537d0 100644 --- a/src/main/java/com/schematic/api/resources/accounts/requests/UpdateEnvironmentRequestBody.java +++ b/src/main/java/com/schematic/api/resources/accounts/requests/UpdateEnvironmentRequestBody.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateEnvironmentRequestBody.Builder.class) public final class UpdateEnvironmentRequestBody { private final Optional environmentType; @@ -99,7 +99,7 @@ public Builder environmentType(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/types/CountApiKeysParams.java b/src/main/java/com/schematic/api/resources/accounts/types/CountApiKeysParams.java index 8653fea..8c9a83c 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/CountApiKeysParams.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/CountApiKeysParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountApiKeysParams.Builder.class) public final class CountApiKeysParams { private final Optional environmentId; @@ -131,7 +131,7 @@ public Builder environmentId(Optional environmentId) { } public Builder environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -142,7 +142,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -153,7 +153,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -164,7 +164,7 @@ public Builder requireEnvironment(Optional requireEnvironment) { } public Builder requireEnvironment(Boolean requireEnvironment) { - this.requireEnvironment = Optional.of(requireEnvironment); + this.requireEnvironment = Optional.ofNullable(requireEnvironment); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/types/CountApiKeysResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/CountApiKeysResponse.java index 2ad1fa9..d94f8b5 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/CountApiKeysResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/CountApiKeysResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountApiKeysResponse.Builder.class) public final class CountApiKeysResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/CountApiRequestsParams.java b/src/main/java/com/schematic/api/resources/accounts/types/CountApiRequestsParams.java index 4dcef73..7a2888d 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/CountApiRequestsParams.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/CountApiRequestsParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountApiRequestsParams.Builder.class) public final class CountApiRequestsParams { private final Optional environmentId; @@ -144,7 +144,7 @@ public Builder environmentId(Optional environmentId) { } public Builder environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -155,7 +155,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -166,7 +166,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -177,7 +177,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -188,7 +188,7 @@ public Builder requestType(Optional requestType) { } public Builder requestType(String requestType) { - this.requestType = Optional.of(requestType); + this.requestType = Optional.ofNullable(requestType); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/types/CountApiRequestsResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/CountApiRequestsResponse.java index 8276e78..a7bfaa5 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/CountApiRequestsResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/CountApiRequestsResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountApiRequestsResponse.Builder.class) public final class CountApiRequestsResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/CreateApiKeyResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/CreateApiKeyResponse.java index f59bb89..f8a8ae7 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/CreateApiKeyResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/CreateApiKeyResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateApiKeyResponse.Builder.class) public final class CreateApiKeyResponse { private final ApiKeyCreateResponseData data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/CreateEnvironmentResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/CreateEnvironmentResponse.java index 2ed865e..c9f33c6 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/CreateEnvironmentResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/CreateEnvironmentResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateEnvironmentResponse.Builder.class) public final class CreateEnvironmentResponse { private final EnvironmentDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/DeleteApiKeyResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/DeleteApiKeyResponse.java index 1d015ea..d517327 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/DeleteApiKeyResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/DeleteApiKeyResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteApiKeyResponse.Builder.class) public final class DeleteApiKeyResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/DeleteEnvironmentResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/DeleteEnvironmentResponse.java index 75280d9..40a1408 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/DeleteEnvironmentResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/DeleteEnvironmentResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteEnvironmentResponse.Builder.class) public final class DeleteEnvironmentResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/GetApiKeyResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/GetApiKeyResponse.java index 5bdf20b..135d936 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/GetApiKeyResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/GetApiKeyResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetApiKeyResponse.Builder.class) public final class GetApiKeyResponse { private final ApiKeyResponseData data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/GetApiRequestResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/GetApiRequestResponse.java index a6718e2..a7da997 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/GetApiRequestResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/GetApiRequestResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetApiRequestResponse.Builder.class) public final class GetApiRequestResponse { private final ApiKeyRequestResponseData data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/GetEnvironmentResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/GetEnvironmentResponse.java index ee73c4a..35fb325 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/GetEnvironmentResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/GetEnvironmentResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetEnvironmentResponse.Builder.class) public final class GetEnvironmentResponse { private final EnvironmentResponseData data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/ListApiKeysParams.java b/src/main/java/com/schematic/api/resources/accounts/types/ListApiKeysParams.java index b0a40d6..bbe3972 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/ListApiKeysParams.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/ListApiKeysParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListApiKeysParams.Builder.class) public final class ListApiKeysParams { private final Optional environmentId; @@ -131,7 +131,7 @@ public Builder environmentId(Optional environmentId) { } public Builder environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -142,7 +142,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -153,7 +153,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -164,7 +164,7 @@ public Builder requireEnvironment(Optional requireEnvironment) { } public Builder requireEnvironment(Boolean requireEnvironment) { - this.requireEnvironment = Optional.of(requireEnvironment); + this.requireEnvironment = Optional.ofNullable(requireEnvironment); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/types/ListApiKeysResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/ListApiKeysResponse.java index 810cf5c..0647d4e 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/ListApiKeysResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/ListApiKeysResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListApiKeysResponse.Builder.class) public final class ListApiKeysResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/ListApiRequestsParams.java b/src/main/java/com/schematic/api/resources/accounts/types/ListApiRequestsParams.java index e56ffa0..f38ec52 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/ListApiRequestsParams.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/ListApiRequestsParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListApiRequestsParams.Builder.class) public final class ListApiRequestsParams { private final Optional environmentId; @@ -144,7 +144,7 @@ public Builder environmentId(Optional environmentId) { } public Builder environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -155,7 +155,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -166,7 +166,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -177,7 +177,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -188,7 +188,7 @@ public Builder requestType(Optional requestType) { } public Builder requestType(String requestType) { - this.requestType = Optional.of(requestType); + this.requestType = Optional.ofNullable(requestType); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/types/ListApiRequestsResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/ListApiRequestsResponse.java index f536ff7..89e7c27 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/ListApiRequestsResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/ListApiRequestsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListApiRequestsResponse.Builder.class) public final class ListApiRequestsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/ListEnvironmentsParams.java b/src/main/java/com/schematic/api/resources/accounts/types/ListEnvironmentsParams.java index ab07d3f..b0a5528 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/ListEnvironmentsParams.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/ListEnvironmentsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListEnvironmentsParams.Builder.class) public final class ListEnvironmentsParams { private final Optional> ids; @@ -117,7 +117,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -128,7 +128,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -139,7 +139,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/accounts/types/ListEnvironmentsResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/ListEnvironmentsResponse.java index f70985a..84720c8 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/ListEnvironmentsResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/ListEnvironmentsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListEnvironmentsResponse.Builder.class) public final class ListEnvironmentsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/UpdateApiKeyResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/UpdateApiKeyResponse.java index d467429..d417b50 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/UpdateApiKeyResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/UpdateApiKeyResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateApiKeyResponse.Builder.class) public final class UpdateApiKeyResponse { private final ApiKeyResponseData data; diff --git a/src/main/java/com/schematic/api/resources/accounts/types/UpdateEnvironmentResponse.java b/src/main/java/com/schematic/api/resources/accounts/types/UpdateEnvironmentResponse.java index 84ae081..b54cace 100644 --- a/src/main/java/com/schematic/api/resources/accounts/types/UpdateEnvironmentResponse.java +++ b/src/main/java/com/schematic/api/resources/accounts/types/UpdateEnvironmentResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateEnvironmentResponse.Builder.class) public final class UpdateEnvironmentResponse { private final EnvironmentResponseData data; diff --git a/src/main/java/com/schematic/api/resources/billing/BillingClient.java b/src/main/java/com/schematic/api/resources/billing/BillingClient.java index f5da0da..ab399c2 100644 --- a/src/main/java/com/schematic/api/resources/billing/BillingClient.java +++ b/src/main/java/com/schematic/api/resources/billing/BillingClient.java @@ -20,6 +20,7 @@ import com.schematic.api.resources.billing.requests.CreateBillingPriceRequestBody; import com.schematic.api.resources.billing.requests.CreateBillingProductRequestBody; import com.schematic.api.resources.billing.requests.CreateBillingSubscriptionsRequestBody; +import com.schematic.api.resources.billing.requests.CreateCouponRequestBody; import com.schematic.api.resources.billing.requests.CreateInvoiceRequestBody; import com.schematic.api.resources.billing.requests.CreateMeterRequestBody; import com.schematic.api.resources.billing.requests.CreatePaymentMethodRequestBody; @@ -40,6 +41,7 @@ import com.schematic.api.resources.billing.types.ListPaymentMethodsResponse; import com.schematic.api.resources.billing.types.ListProductPricesResponse; import com.schematic.api.resources.billing.types.SearchBillingPricesResponse; +import com.schematic.api.resources.billing.types.UpsertBillingCouponResponse; import com.schematic.api.resources.billing.types.UpsertBillingCustomerResponse; import com.schematic.api.resources.billing.types.UpsertBillingMeterResponse; import com.schematic.api.resources.billing.types.UpsertBillingPriceResponse; @@ -64,6 +66,66 @@ public BillingClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } + public UpsertBillingCouponResponse upsertBillingCoupon(CreateCouponRequestBody request) { + return upsertBillingCoupon(request, null); + } + + public UpsertBillingCouponResponse upsertBillingCoupon( + CreateCouponRequestBody request, RequestOptions requestOptions) { + HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) + .newBuilder() + .addPathSegments("billing/coupons") + .build(); + RequestBody body; + try { + body = RequestBody.create( + ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); + } catch (JsonProcessingException e) { + throw new BaseSchematicException("Failed to serialize request", e); + } + Request okhttpRequest = new Request.Builder() + .url(httpUrl) + .method("POST", body) + .headers(Headers.of(clientOptions.headers(requestOptions))) + .addHeader("Content-Type", "application/json") + .build(); + OkHttpClient client = clientOptions.httpClient(); + if (requestOptions != null && requestOptions.getTimeout().isPresent()) { + client = clientOptions.httpClientWithTimeout(requestOptions); + } + try (Response response = client.newCall(okhttpRequest).execute()) { + ResponseBody responseBody = response.body(); + if (response.isSuccessful()) { + return ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), UpsertBillingCouponResponse.class); + } + String responseBodyString = responseBody != null ? responseBody.string() : "{}"; + try { + switch (response.code()) { + case 400: + throw new BadRequestError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 401: + throw new UnauthorizedError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 403: + throw new ForbiddenError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 500: + throw new InternalServerError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + } + } catch (JsonProcessingException ignored) { + // unable to map error response, throwing generic error + } + throw new BaseSchematicApiException( + "Error with status code " + response.code(), + response.code(), + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class)); + } catch (IOException e) { + throw new BaseSchematicException("Network error executing HTTP request", e); + } + } + public UpsertBillingCustomerResponse upsertBillingCustomer(CreateBillingCustomerRequestBody request) { return upsertBillingCustomer(request, null); } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/CountBillingProductsRequest.java b/src/main/java/com/schematic/api/resources/billing/requests/CountBillingProductsRequest.java index 0fdb177..3856688 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/CountBillingProductsRequest.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/CountBillingProductsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountBillingProductsRequest.Builder.class) public final class CountBillingProductsRequest { private final Optional ids; @@ -214,7 +214,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -225,7 +225,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -236,7 +236,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -247,7 +247,7 @@ public Builder priceUsageType(Optional priceUsageType) { } public Builder priceUsageType(String priceUsageType) { - this.priceUsageType = Optional.of(priceUsageType); + this.priceUsageType = Optional.ofNullable(priceUsageType); return this; } @@ -258,7 +258,7 @@ public Builder withoutLinkedToPlan(Optional withoutLinkedToPlan) { } public Builder withoutLinkedToPlan(Boolean withoutLinkedToPlan) { - this.withoutLinkedToPlan = Optional.of(withoutLinkedToPlan); + this.withoutLinkedToPlan = Optional.ofNullable(withoutLinkedToPlan); return this; } @@ -269,7 +269,7 @@ public Builder withZeroPrice(Optional withZeroPrice) { } public Builder withZeroPrice(Boolean withZeroPrice) { - this.withZeroPrice = Optional.of(withZeroPrice); + this.withZeroPrice = Optional.ofNullable(withZeroPrice); return this; } @@ -280,7 +280,7 @@ public Builder withPricesOnly(Optional withPricesOnly) { } public Builder withPricesOnly(Boolean withPricesOnly) { - this.withPricesOnly = Optional.of(withPricesOnly); + this.withPricesOnly = Optional.ofNullable(withPricesOnly); return this; } @@ -291,7 +291,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -302,7 +302,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/CountCustomersRequest.java b/src/main/java/com/schematic/api/resources/billing/requests/CountCustomersRequest.java index dc509b7..47f01dc 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/CountCustomersRequest.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/CountCustomersRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountCustomersRequest.Builder.class) public final class CountCustomersRequest { private final Optional name; @@ -144,7 +144,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -155,7 +155,7 @@ public Builder failedToImport(Optional failedToImport) { } public Builder failedToImport(Boolean failedToImport) { - this.failedToImport = Optional.of(failedToImport); + this.failedToImport = Optional.ofNullable(failedToImport); return this; } @@ -166,7 +166,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -177,7 +177,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -188,7 +188,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingCustomerRequestBody.java b/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingCustomerRequestBody.java index d44e67d..bdfc64c 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingCustomerRequestBody.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingCustomerRequestBody.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateBillingCustomerRequestBody.Builder.class) public final class CreateBillingCustomerRequestBody { private final Optional companyId; @@ -229,7 +229,7 @@ public _FinalStage meta(Map meta) { @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingPriceRequestBody.java b/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingPriceRequestBody.java index ade1e15..1c001d8 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingPriceRequestBody.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingPriceRequestBody.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateBillingPriceRequestBody.Builder.class) public final class CreateBillingPriceRequestBody { private final String currency; @@ -250,7 +250,7 @@ public _FinalStage usageType(String usageType) { @java.lang.Override public _FinalStage meterId(String meterId) { - this.meterId = Optional.of(meterId); + this.meterId = Optional.ofNullable(meterId); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingProductRequestBody.java b/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingProductRequestBody.java index 2fb1fa7..ef2a5bf 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingProductRequestBody.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingProductRequestBody.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateBillingProductRequestBody.Builder.class) public final class CreateBillingProductRequestBody { private final String currency; diff --git a/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingSubscriptionsRequestBody.java b/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingSubscriptionsRequestBody.java index 09594ac..3b3b76d 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingSubscriptionsRequestBody.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/CreateBillingSubscriptionsRequestBody.java @@ -14,6 +14,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.schematic.api.core.ObjectMappers; import com.schematic.api.types.BillingProductPricing; +import com.schematic.api.types.BillingSubscriptionDiscount; import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; @@ -22,13 +23,15 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateBillingSubscriptionsRequestBody.Builder.class) public final class CreateBillingSubscriptionsRequestBody { private final String currency; private final String customerExternalId; + private final List discounts; + private final OffsetDateTime expiredAt; private final Optional interval; @@ -49,11 +52,14 @@ public final class CreateBillingSubscriptionsRequestBody { private final Optional trialEnd; + private final Optional trialEndSetting; + private final Map additionalProperties; private CreateBillingSubscriptionsRequestBody( String currency, String customerExternalId, + List discounts, OffsetDateTime expiredAt, Optional interval, Optional> metadata, @@ -64,9 +70,11 @@ private CreateBillingSubscriptionsRequestBody( String subscriptionExternalId, int totalPrice, Optional trialEnd, + Optional trialEndSetting, Map additionalProperties) { this.currency = currency; this.customerExternalId = customerExternalId; + this.discounts = discounts; this.expiredAt = expiredAt; this.interval = interval; this.metadata = metadata; @@ -77,6 +85,7 @@ private CreateBillingSubscriptionsRequestBody( this.subscriptionExternalId = subscriptionExternalId; this.totalPrice = totalPrice; this.trialEnd = trialEnd; + this.trialEndSetting = trialEndSetting; this.additionalProperties = additionalProperties; } @@ -90,6 +99,11 @@ public String getCustomerExternalId() { return customerExternalId; } + @JsonProperty("discounts") + public List getDiscounts() { + return discounts; + } + @JsonProperty("expired_at") public OffsetDateTime getExpiredAt() { return expiredAt; @@ -140,6 +154,11 @@ public Optional getTrialEnd() { return trialEnd; } + @JsonProperty("trial_end_setting") + public Optional getTrialEndSetting() { + return trialEndSetting; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -155,6 +174,7 @@ public Map getAdditionalProperties() { private boolean equalTo(CreateBillingSubscriptionsRequestBody other) { return currency.equals(other.currency) && customerExternalId.equals(other.customerExternalId) + && discounts.equals(other.discounts) && expiredAt.equals(other.expiredAt) && interval.equals(other.interval) && metadata.equals(other.metadata) @@ -164,7 +184,8 @@ private boolean equalTo(CreateBillingSubscriptionsRequestBody other) { && status.equals(other.status) && subscriptionExternalId.equals(other.subscriptionExternalId) && totalPrice == other.totalPrice - && trialEnd.equals(other.trialEnd); + && trialEnd.equals(other.trialEnd) + && trialEndSetting.equals(other.trialEndSetting); } @java.lang.Override @@ -172,6 +193,7 @@ public int hashCode() { return Objects.hash( this.currency, this.customerExternalId, + this.discounts, this.expiredAt, this.interval, this.metadata, @@ -181,7 +203,8 @@ public int hashCode() { this.status, this.subscriptionExternalId, this.totalPrice, - this.trialEnd); + this.trialEnd, + this.trialEndSetting); } @java.lang.Override @@ -218,6 +241,12 @@ public interface TotalPriceStage { public interface _FinalStage { CreateBillingSubscriptionsRequestBody build(); + _FinalStage discounts(List discounts); + + _FinalStage addDiscounts(BillingSubscriptionDiscount discounts); + + _FinalStage addAllDiscounts(List discounts); + _FinalStage interval(Optional interval); _FinalStage interval(String interval); @@ -247,6 +276,10 @@ public interface _FinalStage { _FinalStage trialEnd(Optional trialEnd); _FinalStage trialEnd(Integer trialEnd); + + _FinalStage trialEndSetting(Optional trialEndSetting); + + _FinalStage trialEndSetting(String trialEndSetting); } @JsonIgnoreProperties(ignoreUnknown = true) @@ -267,6 +300,8 @@ public static final class Builder private int totalPrice; + private Optional trialEndSetting = Optional.empty(); + private Optional trialEnd = Optional.empty(); private Optional status = Optional.empty(); @@ -281,6 +316,8 @@ public static final class Builder private Optional interval = Optional.empty(); + private List discounts = new ArrayList<>(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -290,6 +327,7 @@ private Builder() {} public Builder from(CreateBillingSubscriptionsRequestBody other) { currency(other.getCurrency()); customerExternalId(other.getCustomerExternalId()); + discounts(other.getDiscounts()); expiredAt(other.getExpiredAt()); interval(other.getInterval()); metadata(other.getMetadata()); @@ -300,6 +338,7 @@ public Builder from(CreateBillingSubscriptionsRequestBody other) { subscriptionExternalId(other.getSubscriptionExternalId()); totalPrice(other.getTotalPrice()); trialEnd(other.getTrialEnd()); + trialEndSetting(other.getTrialEndSetting()); return this; } @@ -338,9 +377,22 @@ public _FinalStage totalPrice(int totalPrice) { return this; } + @java.lang.Override + public _FinalStage trialEndSetting(String trialEndSetting) { + this.trialEndSetting = Optional.ofNullable(trialEndSetting); + return this; + } + + @java.lang.Override + @JsonSetter(value = "trial_end_setting", nulls = Nulls.SKIP) + public _FinalStage trialEndSetting(Optional trialEndSetting) { + this.trialEndSetting = trialEndSetting; + return this; + } + @java.lang.Override public _FinalStage trialEnd(Integer trialEnd) { - this.trialEnd = Optional.of(trialEnd); + this.trialEnd = Optional.ofNullable(trialEnd); return this; } @@ -353,7 +405,7 @@ public _FinalStage trialEnd(Optional trialEnd) { @java.lang.Override public _FinalStage status(String status) { - this.status = Optional.of(status); + this.status = Optional.ofNullable(status); return this; } @@ -386,7 +438,7 @@ public _FinalStage productExternalIds(List productExterna @java.lang.Override public _FinalStage periodStart(Integer periodStart) { - this.periodStart = Optional.of(periodStart); + this.periodStart = Optional.ofNullable(periodStart); return this; } @@ -399,7 +451,7 @@ public _FinalStage periodStart(Optional periodStart) { @java.lang.Override public _FinalStage periodEnd(Integer periodEnd) { - this.periodEnd = Optional.of(periodEnd); + this.periodEnd = Optional.ofNullable(periodEnd); return this; } @@ -412,7 +464,7 @@ public _FinalStage periodEnd(Optional periodEnd) { @java.lang.Override public _FinalStage metadata(Map metadata) { - this.metadata = Optional.of(metadata); + this.metadata = Optional.ofNullable(metadata); return this; } @@ -425,7 +477,7 @@ public _FinalStage metadata(Optional> metadata) { @java.lang.Override public _FinalStage interval(String interval) { - this.interval = Optional.of(interval); + this.interval = Optional.ofNullable(interval); return this; } @@ -436,11 +488,32 @@ public _FinalStage interval(Optional interval) { return this; } + @java.lang.Override + public _FinalStage addAllDiscounts(List discounts) { + this.discounts.addAll(discounts); + return this; + } + + @java.lang.Override + public _FinalStage addDiscounts(BillingSubscriptionDiscount discounts) { + this.discounts.add(discounts); + return this; + } + + @java.lang.Override + @JsonSetter(value = "discounts", nulls = Nulls.SKIP) + public _FinalStage discounts(List discounts) { + this.discounts.clear(); + this.discounts.addAll(discounts); + return this; + } + @java.lang.Override public CreateBillingSubscriptionsRequestBody build() { return new CreateBillingSubscriptionsRequestBody( currency, customerExternalId, + discounts, expiredAt, interval, metadata, @@ -451,6 +524,7 @@ public CreateBillingSubscriptionsRequestBody build() { subscriptionExternalId, totalPrice, trialEnd, + trialEndSetting, additionalProperties); } } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/CreateCouponRequestBody.java b/src/main/java/com/schematic/api/resources/billing/requests/CreateCouponRequestBody.java new file mode 100644 index 0000000..12edeaa --- /dev/null +++ b/src/main/java/com/schematic/api/resources/billing/requests/CreateCouponRequestBody.java @@ -0,0 +1,331 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.resources.billing.requests; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = CreateCouponRequestBody.Builder.class) +public final class CreateCouponRequestBody { + private final int amountOff; + + private final Optional currency; + + private final String duration; + + private final int durationInMonths; + + private final String externalId; + + private final int maxRedemptions; + + private final String name; + + private final double percentOff; + + private final int timesRedeemed; + + private final Map additionalProperties; + + private CreateCouponRequestBody( + int amountOff, + Optional currency, + String duration, + int durationInMonths, + String externalId, + int maxRedemptions, + String name, + double percentOff, + int timesRedeemed, + Map additionalProperties) { + this.amountOff = amountOff; + this.currency = currency; + this.duration = duration; + this.durationInMonths = durationInMonths; + this.externalId = externalId; + this.maxRedemptions = maxRedemptions; + this.name = name; + this.percentOff = percentOff; + this.timesRedeemed = timesRedeemed; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("amount_off") + public int getAmountOff() { + return amountOff; + } + + @JsonProperty("currency") + public Optional getCurrency() { + return currency; + } + + @JsonProperty("duration") + public String getDuration() { + return duration; + } + + @JsonProperty("duration_in_months") + public int getDurationInMonths() { + return durationInMonths; + } + + @JsonProperty("external_id") + public String getExternalId() { + return externalId; + } + + @JsonProperty("max_redemptions") + public int getMaxRedemptions() { + return maxRedemptions; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("percent_off") + public double getPercentOff() { + return percentOff; + } + + @JsonProperty("times_redeemed") + public int getTimesRedeemed() { + return timesRedeemed; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof CreateCouponRequestBody && equalTo((CreateCouponRequestBody) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(CreateCouponRequestBody other) { + return amountOff == other.amountOff + && currency.equals(other.currency) + && duration.equals(other.duration) + && durationInMonths == other.durationInMonths + && externalId.equals(other.externalId) + && maxRedemptions == other.maxRedemptions + && name.equals(other.name) + && percentOff == other.percentOff + && timesRedeemed == other.timesRedeemed; + } + + @java.lang.Override + public int hashCode() { + return Objects.hash( + this.amountOff, + this.currency, + this.duration, + this.durationInMonths, + this.externalId, + this.maxRedemptions, + this.name, + this.percentOff, + this.timesRedeemed); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static AmountOffStage builder() { + return new Builder(); + } + + public interface AmountOffStage { + DurationStage amountOff(int amountOff); + + Builder from(CreateCouponRequestBody other); + } + + public interface DurationStage { + DurationInMonthsStage duration(String duration); + } + + public interface DurationInMonthsStage { + ExternalIdStage durationInMonths(int durationInMonths); + } + + public interface ExternalIdStage { + MaxRedemptionsStage externalId(String externalId); + } + + public interface MaxRedemptionsStage { + NameStage maxRedemptions(int maxRedemptions); + } + + public interface NameStage { + PercentOffStage name(String name); + } + + public interface PercentOffStage { + TimesRedeemedStage percentOff(double percentOff); + } + + public interface TimesRedeemedStage { + _FinalStage timesRedeemed(int timesRedeemed); + } + + public interface _FinalStage { + CreateCouponRequestBody build(); + + _FinalStage currency(Optional currency); + + _FinalStage currency(String currency); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder + implements AmountOffStage, + DurationStage, + DurationInMonthsStage, + ExternalIdStage, + MaxRedemptionsStage, + NameStage, + PercentOffStage, + TimesRedeemedStage, + _FinalStage { + private int amountOff; + + private String duration; + + private int durationInMonths; + + private String externalId; + + private int maxRedemptions; + + private String name; + + private double percentOff; + + private int timesRedeemed; + + private Optional currency = Optional.empty(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(CreateCouponRequestBody other) { + amountOff(other.getAmountOff()); + currency(other.getCurrency()); + duration(other.getDuration()); + durationInMonths(other.getDurationInMonths()); + externalId(other.getExternalId()); + maxRedemptions(other.getMaxRedemptions()); + name(other.getName()); + percentOff(other.getPercentOff()); + timesRedeemed(other.getTimesRedeemed()); + return this; + } + + @java.lang.Override + @JsonSetter("amount_off") + public DurationStage amountOff(int amountOff) { + this.amountOff = amountOff; + return this; + } + + @java.lang.Override + @JsonSetter("duration") + public DurationInMonthsStage duration(String duration) { + this.duration = duration; + return this; + } + + @java.lang.Override + @JsonSetter("duration_in_months") + public ExternalIdStage durationInMonths(int durationInMonths) { + this.durationInMonths = durationInMonths; + return this; + } + + @java.lang.Override + @JsonSetter("external_id") + public MaxRedemptionsStage externalId(String externalId) { + this.externalId = externalId; + return this; + } + + @java.lang.Override + @JsonSetter("max_redemptions") + public NameStage maxRedemptions(int maxRedemptions) { + this.maxRedemptions = maxRedemptions; + return this; + } + + @java.lang.Override + @JsonSetter("name") + public PercentOffStage name(String name) { + this.name = name; + return this; + } + + @java.lang.Override + @JsonSetter("percent_off") + public TimesRedeemedStage percentOff(double percentOff) { + this.percentOff = percentOff; + return this; + } + + @java.lang.Override + @JsonSetter("times_redeemed") + public _FinalStage timesRedeemed(int timesRedeemed) { + this.timesRedeemed = timesRedeemed; + return this; + } + + @java.lang.Override + public _FinalStage currency(String currency) { + this.currency = Optional.ofNullable(currency); + return this; + } + + @java.lang.Override + @JsonSetter(value = "currency", nulls = Nulls.SKIP) + public _FinalStage currency(Optional currency) { + this.currency = currency; + return this; + } + + @java.lang.Override + public CreateCouponRequestBody build() { + return new CreateCouponRequestBody( + amountOff, + currency, + duration, + durationInMonths, + externalId, + maxRedemptions, + name, + percentOff, + timesRedeemed, + additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/resources/billing/requests/CreateInvoiceRequestBody.java b/src/main/java/com/schematic/api/resources/billing/requests/CreateInvoiceRequestBody.java index 4dc345c..8bc8d44 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/CreateInvoiceRequestBody.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/CreateInvoiceRequestBody.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateInvoiceRequestBody.Builder.class) public final class CreateInvoiceRequestBody { private final int amountDue; @@ -349,7 +349,7 @@ public _FinalStage subtotal(int subtotal) { @java.lang.Override public _FinalStage url(String url) { - this.url = Optional.of(url); + this.url = Optional.ofNullable(url); return this; } @@ -362,7 +362,7 @@ public _FinalStage url(Optional url) { @java.lang.Override public _FinalStage subscriptionExternalId(String subscriptionExternalId) { - this.subscriptionExternalId = Optional.of(subscriptionExternalId); + this.subscriptionExternalId = Optional.ofNullable(subscriptionExternalId); return this; } @@ -375,7 +375,7 @@ public _FinalStage subscriptionExternalId(Optional subscriptionExternalI @java.lang.Override public _FinalStage paymentMethodExternalId(String paymentMethodExternalId) { - this.paymentMethodExternalId = Optional.of(paymentMethodExternalId); + this.paymentMethodExternalId = Optional.ofNullable(paymentMethodExternalId); return this; } @@ -388,7 +388,7 @@ public _FinalStage paymentMethodExternalId(Optional paymentMethodExterna @java.lang.Override public _FinalStage externalId(String externalId) { - this.externalId = Optional.of(externalId); + this.externalId = Optional.ofNullable(externalId); return this; } @@ -401,7 +401,7 @@ public _FinalStage externalId(Optional externalId) { @java.lang.Override public _FinalStage dueDate(OffsetDateTime dueDate) { - this.dueDate = Optional.of(dueDate); + this.dueDate = Optional.ofNullable(dueDate); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/CreateMeterRequestBody.java b/src/main/java/com/schematic/api/resources/billing/requests/CreateMeterRequestBody.java index f5e1d18..b86af31 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/CreateMeterRequestBody.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/CreateMeterRequestBody.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateMeterRequestBody.Builder.class) public final class CreateMeterRequestBody { private final String displayName; diff --git a/src/main/java/com/schematic/api/resources/billing/requests/CreatePaymentMethodRequestBody.java b/src/main/java/com/schematic/api/resources/billing/requests/CreatePaymentMethodRequestBody.java index 27866d3..6633120 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/CreatePaymentMethodRequestBody.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/CreatePaymentMethodRequestBody.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreatePaymentMethodRequestBody.Builder.class) public final class CreatePaymentMethodRequestBody { private final Optional accountLast4; @@ -331,7 +331,7 @@ public _FinalStage paymentMethodType(String paymentMethodType) { @java.lang.Override public _FinalStage subscriptionExternalId(String subscriptionExternalId) { - this.subscriptionExternalId = Optional.of(subscriptionExternalId); + this.subscriptionExternalId = Optional.ofNullable(subscriptionExternalId); return this; } @@ -344,7 +344,7 @@ public _FinalStage subscriptionExternalId(Optional subscriptionExternalI @java.lang.Override public _FinalStage cardLast4(String cardLast4) { - this.cardLast4 = Optional.of(cardLast4); + this.cardLast4 = Optional.ofNullable(cardLast4); return this; } @@ -357,7 +357,7 @@ public _FinalStage cardLast4(Optional cardLast4) { @java.lang.Override public _FinalStage cardExpYear(Integer cardExpYear) { - this.cardExpYear = Optional.of(cardExpYear); + this.cardExpYear = Optional.ofNullable(cardExpYear); return this; } @@ -370,7 +370,7 @@ public _FinalStage cardExpYear(Optional cardExpYear) { @java.lang.Override public _FinalStage cardExpMonth(Integer cardExpMonth) { - this.cardExpMonth = Optional.of(cardExpMonth); + this.cardExpMonth = Optional.ofNullable(cardExpMonth); return this; } @@ -383,7 +383,7 @@ public _FinalStage cardExpMonth(Optional cardExpMonth) { @java.lang.Override public _FinalStage cardBrand(String cardBrand) { - this.cardBrand = Optional.of(cardBrand); + this.cardBrand = Optional.ofNullable(cardBrand); return this; } @@ -396,7 +396,7 @@ public _FinalStage cardBrand(Optional cardBrand) { @java.lang.Override public _FinalStage billingName(String billingName) { - this.billingName = Optional.of(billingName); + this.billingName = Optional.ofNullable(billingName); return this; } @@ -409,7 +409,7 @@ public _FinalStage billingName(Optional billingName) { @java.lang.Override public _FinalStage billingEmail(String billingEmail) { - this.billingEmail = Optional.of(billingEmail); + this.billingEmail = Optional.ofNullable(billingEmail); return this; } @@ -422,7 +422,7 @@ public _FinalStage billingEmail(Optional billingEmail) { @java.lang.Override public _FinalStage bankName(String bankName) { - this.bankName = Optional.of(bankName); + this.bankName = Optional.ofNullable(bankName); return this; } @@ -435,7 +435,7 @@ public _FinalStage bankName(Optional bankName) { @java.lang.Override public _FinalStage accountName(String accountName) { - this.accountName = Optional.of(accountName); + this.accountName = Optional.ofNullable(accountName); return this; } @@ -448,7 +448,7 @@ public _FinalStage accountName(Optional accountName) { @java.lang.Override public _FinalStage accountLast4(String accountLast4) { - this.accountLast4 = Optional.of(accountLast4); + this.accountLast4 = Optional.ofNullable(accountLast4); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/ListBillingProductsRequest.java b/src/main/java/com/schematic/api/resources/billing/requests/ListBillingProductsRequest.java index 0a830cf..04dc4d1 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/ListBillingProductsRequest.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/ListBillingProductsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListBillingProductsRequest.Builder.class) public final class ListBillingProductsRequest { private final Optional ids; @@ -214,7 +214,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -225,7 +225,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -236,7 +236,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -247,7 +247,7 @@ public Builder priceUsageType(Optional priceUsageType) { } public Builder priceUsageType(String priceUsageType) { - this.priceUsageType = Optional.of(priceUsageType); + this.priceUsageType = Optional.ofNullable(priceUsageType); return this; } @@ -258,7 +258,7 @@ public Builder withoutLinkedToPlan(Optional withoutLinkedToPlan) { } public Builder withoutLinkedToPlan(Boolean withoutLinkedToPlan) { - this.withoutLinkedToPlan = Optional.of(withoutLinkedToPlan); + this.withoutLinkedToPlan = Optional.ofNullable(withoutLinkedToPlan); return this; } @@ -269,7 +269,7 @@ public Builder withZeroPrice(Optional withZeroPrice) { } public Builder withZeroPrice(Boolean withZeroPrice) { - this.withZeroPrice = Optional.of(withZeroPrice); + this.withZeroPrice = Optional.ofNullable(withZeroPrice); return this; } @@ -280,7 +280,7 @@ public Builder withPricesOnly(Optional withPricesOnly) { } public Builder withPricesOnly(Boolean withPricesOnly) { - this.withPricesOnly = Optional.of(withPricesOnly); + this.withPricesOnly = Optional.ofNullable(withPricesOnly); return this; } @@ -291,7 +291,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -302,7 +302,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/ListCustomersRequest.java b/src/main/java/com/schematic/api/resources/billing/requests/ListCustomersRequest.java index fda7eb9..c3fe55f 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/ListCustomersRequest.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/ListCustomersRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCustomersRequest.Builder.class) public final class ListCustomersRequest { private final Optional name; @@ -144,7 +144,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -155,7 +155,7 @@ public Builder failedToImport(Optional failedToImport) { } public Builder failedToImport(Boolean failedToImport) { - this.failedToImport = Optional.of(failedToImport); + this.failedToImport = Optional.ofNullable(failedToImport); return this; } @@ -166,7 +166,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -177,7 +177,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -188,7 +188,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/ListInvoicesRequest.java b/src/main/java/com/schematic/api/resources/billing/requests/ListInvoicesRequest.java index 31fedd5..3dcdff3 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/ListInvoicesRequest.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/ListInvoicesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListInvoicesRequest.Builder.class) public final class ListInvoicesRequest { private final Optional companyId; @@ -178,7 +178,7 @@ public _FinalStage customerExternalId(String customerExternalId) { */ @java.lang.Override public _FinalStage offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -195,7 +195,7 @@ public _FinalStage offset(Optional offset) { */ @java.lang.Override public _FinalStage limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -208,7 +208,7 @@ public _FinalStage limit(Optional limit) { @java.lang.Override public _FinalStage subscriptionExternalId(String subscriptionExternalId) { - this.subscriptionExternalId = Optional.of(subscriptionExternalId); + this.subscriptionExternalId = Optional.ofNullable(subscriptionExternalId); return this; } @@ -221,7 +221,7 @@ public _FinalStage subscriptionExternalId(Optional subscriptionExternalI @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/ListMetersRequest.java b/src/main/java/com/schematic/api/resources/billing/requests/ListMetersRequest.java index f04c77e..0faa2fd 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/ListMetersRequest.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/ListMetersRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListMetersRequest.Builder.class) public final class ListMetersRequest { private final Optional displayName; @@ -116,7 +116,7 @@ public Builder displayName(Optional displayName) { } public Builder displayName(String displayName) { - this.displayName = Optional.of(displayName); + this.displayName = Optional.ofNullable(displayName); return this; } @@ -127,7 +127,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -138,7 +138,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/ListPaymentMethodsRequest.java b/src/main/java/com/schematic/api/resources/billing/requests/ListPaymentMethodsRequest.java index e22f96b..0a423dc 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/ListPaymentMethodsRequest.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/ListPaymentMethodsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListPaymentMethodsRequest.Builder.class) public final class ListPaymentMethodsRequest { private final Optional companyId; @@ -178,7 +178,7 @@ public _FinalStage customerExternalId(String customerExternalId) { */ @java.lang.Override public _FinalStage offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -195,7 +195,7 @@ public _FinalStage offset(Optional offset) { */ @java.lang.Override public _FinalStage limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -208,7 +208,7 @@ public _FinalStage limit(Optional limit) { @java.lang.Override public _FinalStage subscriptionExternalId(String subscriptionExternalId) { - this.subscriptionExternalId = Optional.of(subscriptionExternalId); + this.subscriptionExternalId = Optional.ofNullable(subscriptionExternalId); return this; } @@ -221,7 +221,7 @@ public _FinalStage subscriptionExternalId(Optional subscriptionExternalI @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/ListProductPricesRequest.java b/src/main/java/com/schematic/api/resources/billing/requests/ListProductPricesRequest.java index 9be056f..2620f16 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/ListProductPricesRequest.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/ListProductPricesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListProductPricesRequest.Builder.class) public final class ListProductPricesRequest { private final Optional ids; @@ -214,7 +214,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -225,7 +225,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -236,7 +236,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -247,7 +247,7 @@ public Builder priceUsageType(Optional priceUsageType) { } public Builder priceUsageType(String priceUsageType) { - this.priceUsageType = Optional.of(priceUsageType); + this.priceUsageType = Optional.ofNullable(priceUsageType); return this; } @@ -258,7 +258,7 @@ public Builder withoutLinkedToPlan(Optional withoutLinkedToPlan) { } public Builder withoutLinkedToPlan(Boolean withoutLinkedToPlan) { - this.withoutLinkedToPlan = Optional.of(withoutLinkedToPlan); + this.withoutLinkedToPlan = Optional.ofNullable(withoutLinkedToPlan); return this; } @@ -269,7 +269,7 @@ public Builder withZeroPrice(Optional withZeroPrice) { } public Builder withZeroPrice(Boolean withZeroPrice) { - this.withZeroPrice = Optional.of(withZeroPrice); + this.withZeroPrice = Optional.ofNullable(withZeroPrice); return this; } @@ -280,7 +280,7 @@ public Builder withPricesOnly(Optional withPricesOnly) { } public Builder withPricesOnly(Boolean withPricesOnly) { - this.withPricesOnly = Optional.of(withPricesOnly); + this.withPricesOnly = Optional.ofNullable(withPricesOnly); return this; } @@ -291,7 +291,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -302,7 +302,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/requests/SearchBillingPricesRequest.java b/src/main/java/com/schematic/api/resources/billing/requests/SearchBillingPricesRequest.java index 8218aa3..8aa1b26 100644 --- a/src/main/java/com/schematic/api/resources/billing/requests/SearchBillingPricesRequest.java +++ b/src/main/java/com/schematic/api/resources/billing/requests/SearchBillingPricesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = SearchBillingPricesRequest.Builder.class) public final class SearchBillingPricesRequest { private final Optional ids; @@ -157,7 +157,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -168,7 +168,7 @@ public Builder interval(Optional interval) { } public Builder interval(String interval) { - this.interval = Optional.of(interval); + this.interval = Optional.ofNullable(interval); return this; } @@ -179,7 +179,7 @@ public Builder usageType(Optional usageType) { } public Builder usageType(String usageType) { - this.usageType = Optional.of(usageType); + this.usageType = Optional.ofNullable(usageType); return this; } @@ -190,7 +190,7 @@ public Builder price(Optional price) { } public Builder price(Integer price) { - this.price = Optional.of(price); + this.price = Optional.ofNullable(price); return this; } @@ -201,7 +201,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -212,7 +212,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/types/CountBillingProductsParams.java b/src/main/java/com/schematic/api/resources/billing/types/CountBillingProductsParams.java index c70f066..a560515 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/CountBillingProductsParams.java +++ b/src/main/java/com/schematic/api/resources/billing/types/CountBillingProductsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountBillingProductsParams.Builder.class) public final class CountBillingProductsParams { private final Optional> ids; @@ -215,7 +215,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -226,7 +226,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -237,7 +237,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -248,7 +248,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -259,7 +259,7 @@ public Builder priceUsageType(Optional priceUsageType) { } public Builder priceUsageType(String priceUsageType) { - this.priceUsageType = Optional.of(priceUsageType); + this.priceUsageType = Optional.ofNullable(priceUsageType); return this; } @@ -270,7 +270,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -281,7 +281,7 @@ public Builder withPricesOnly(Optional withPricesOnly) { } public Builder withPricesOnly(Boolean withPricesOnly) { - this.withPricesOnly = Optional.of(withPricesOnly); + this.withPricesOnly = Optional.ofNullable(withPricesOnly); return this; } @@ -292,7 +292,7 @@ public Builder withZeroPrice(Optional withZeroPrice) { } public Builder withZeroPrice(Boolean withZeroPrice) { - this.withZeroPrice = Optional.of(withZeroPrice); + this.withZeroPrice = Optional.ofNullable(withZeroPrice); return this; } @@ -303,7 +303,7 @@ public Builder withoutLinkedToPlan(Optional withoutLinkedToPlan) { } public Builder withoutLinkedToPlan(Boolean withoutLinkedToPlan) { - this.withoutLinkedToPlan = Optional.of(withoutLinkedToPlan); + this.withoutLinkedToPlan = Optional.ofNullable(withoutLinkedToPlan); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/types/CountBillingProductsResponse.java b/src/main/java/com/schematic/api/resources/billing/types/CountBillingProductsResponse.java index 14aec61..843bb8a 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/CountBillingProductsResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/CountBillingProductsResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountBillingProductsResponse.Builder.class) public final class CountBillingProductsResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/CountCustomersParams.java b/src/main/java/com/schematic/api/resources/billing/types/CountCustomersParams.java index 7b09686..2d1263a 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/CountCustomersParams.java +++ b/src/main/java/com/schematic/api/resources/billing/types/CountCustomersParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountCustomersParams.Builder.class) public final class CountCustomersParams { private final Optional failedToImport; @@ -144,7 +144,7 @@ public Builder failedToImport(Optional failedToImport) { } public Builder failedToImport(Boolean failedToImport) { - this.failedToImport = Optional.of(failedToImport); + this.failedToImport = Optional.ofNullable(failedToImport); return this; } @@ -155,7 +155,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -166,7 +166,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -177,7 +177,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -188,7 +188,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/types/CountCustomersResponse.java b/src/main/java/com/schematic/api/resources/billing/types/CountCustomersResponse.java index 18b5920..8c1ee9b 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/CountCustomersResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/CountCustomersResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountCustomersResponse.Builder.class) public final class CountCustomersResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/DeleteProductPriceResponse.java b/src/main/java/com/schematic/api/resources/billing/types/DeleteProductPriceResponse.java index d8e2774..c1c2747 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/DeleteProductPriceResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/DeleteProductPriceResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteProductPriceResponse.Builder.class) public final class DeleteProductPriceResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/ListBillingProductsParams.java b/src/main/java/com/schematic/api/resources/billing/types/ListBillingProductsParams.java index 0803b71..056b450 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/ListBillingProductsParams.java +++ b/src/main/java/com/schematic/api/resources/billing/types/ListBillingProductsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListBillingProductsParams.Builder.class) public final class ListBillingProductsParams { private final Optional> ids; @@ -215,7 +215,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -226,7 +226,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -237,7 +237,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -248,7 +248,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -259,7 +259,7 @@ public Builder priceUsageType(Optional priceUsageType) { } public Builder priceUsageType(String priceUsageType) { - this.priceUsageType = Optional.of(priceUsageType); + this.priceUsageType = Optional.ofNullable(priceUsageType); return this; } @@ -270,7 +270,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -281,7 +281,7 @@ public Builder withPricesOnly(Optional withPricesOnly) { } public Builder withPricesOnly(Boolean withPricesOnly) { - this.withPricesOnly = Optional.of(withPricesOnly); + this.withPricesOnly = Optional.ofNullable(withPricesOnly); return this; } @@ -292,7 +292,7 @@ public Builder withZeroPrice(Optional withZeroPrice) { } public Builder withZeroPrice(Boolean withZeroPrice) { - this.withZeroPrice = Optional.of(withZeroPrice); + this.withZeroPrice = Optional.ofNullable(withZeroPrice); return this; } @@ -303,7 +303,7 @@ public Builder withoutLinkedToPlan(Optional withoutLinkedToPlan) { } public Builder withoutLinkedToPlan(Boolean withoutLinkedToPlan) { - this.withoutLinkedToPlan = Optional.of(withoutLinkedToPlan); + this.withoutLinkedToPlan = Optional.ofNullable(withoutLinkedToPlan); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/types/ListBillingProductsResponse.java b/src/main/java/com/schematic/api/resources/billing/types/ListBillingProductsResponse.java index c46c152..b4b41c6 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/ListBillingProductsResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/ListBillingProductsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListBillingProductsResponse.Builder.class) public final class ListBillingProductsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/ListCustomersParams.java b/src/main/java/com/schematic/api/resources/billing/types/ListCustomersParams.java index 70dc281..b6d1432 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/ListCustomersParams.java +++ b/src/main/java/com/schematic/api/resources/billing/types/ListCustomersParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCustomersParams.Builder.class) public final class ListCustomersParams { private final Optional failedToImport; @@ -144,7 +144,7 @@ public Builder failedToImport(Optional failedToImport) { } public Builder failedToImport(Boolean failedToImport) { - this.failedToImport = Optional.of(failedToImport); + this.failedToImport = Optional.ofNullable(failedToImport); return this; } @@ -155,7 +155,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -166,7 +166,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -177,7 +177,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -188,7 +188,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/types/ListCustomersResponse.java b/src/main/java/com/schematic/api/resources/billing/types/ListCustomersResponse.java index fe08729..cb6f933 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/ListCustomersResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/ListCustomersResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCustomersResponse.Builder.class) public final class ListCustomersResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/ListInvoicesParams.java b/src/main/java/com/schematic/api/resources/billing/types/ListInvoicesParams.java index 1a3d9b0..8c6030d 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/ListInvoicesParams.java +++ b/src/main/java/com/schematic/api/resources/billing/types/ListInvoicesParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListInvoicesParams.Builder.class) public final class ListInvoicesParams { private final Optional companyId; @@ -145,7 +145,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -156,7 +156,7 @@ public Builder customerExternalId(Optional customerExternalId) { } public Builder customerExternalId(String customerExternalId) { - this.customerExternalId = Optional.of(customerExternalId); + this.customerExternalId = Optional.ofNullable(customerExternalId); return this; } @@ -167,7 +167,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -178,7 +178,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -189,7 +189,7 @@ public Builder subscriptionExternalId(Optional subscriptionExternalId) { } public Builder subscriptionExternalId(String subscriptionExternalId) { - this.subscriptionExternalId = Optional.of(subscriptionExternalId); + this.subscriptionExternalId = Optional.ofNullable(subscriptionExternalId); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/types/ListInvoicesResponse.java b/src/main/java/com/schematic/api/resources/billing/types/ListInvoicesResponse.java index 1f80441..04481f4 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/ListInvoicesResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/ListInvoicesResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListInvoicesResponse.Builder.class) public final class ListInvoicesResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/ListMetersParams.java b/src/main/java/com/schematic/api/resources/billing/types/ListMetersParams.java index 775ff30..21b94c7 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/ListMetersParams.java +++ b/src/main/java/com/schematic/api/resources/billing/types/ListMetersParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListMetersParams.Builder.class) public final class ListMetersParams { private final Optional displayName; @@ -116,7 +116,7 @@ public Builder displayName(Optional displayName) { } public Builder displayName(String displayName) { - this.displayName = Optional.of(displayName); + this.displayName = Optional.ofNullable(displayName); return this; } @@ -127,7 +127,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -138,7 +138,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/types/ListMetersResponse.java b/src/main/java/com/schematic/api/resources/billing/types/ListMetersResponse.java index fd0303c..39fb196 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/ListMetersResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/ListMetersResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListMetersResponse.Builder.class) public final class ListMetersResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/ListPaymentMethodsParams.java b/src/main/java/com/schematic/api/resources/billing/types/ListPaymentMethodsParams.java index a6b8f5a..15b483d 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/ListPaymentMethodsParams.java +++ b/src/main/java/com/schematic/api/resources/billing/types/ListPaymentMethodsParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListPaymentMethodsParams.Builder.class) public final class ListPaymentMethodsParams { private final Optional companyId; @@ -145,7 +145,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -156,7 +156,7 @@ public Builder customerExternalId(Optional customerExternalId) { } public Builder customerExternalId(String customerExternalId) { - this.customerExternalId = Optional.of(customerExternalId); + this.customerExternalId = Optional.ofNullable(customerExternalId); return this; } @@ -167,7 +167,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -178,7 +178,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -189,7 +189,7 @@ public Builder subscriptionExternalId(Optional subscriptionExternalId) { } public Builder subscriptionExternalId(String subscriptionExternalId) { - this.subscriptionExternalId = Optional.of(subscriptionExternalId); + this.subscriptionExternalId = Optional.ofNullable(subscriptionExternalId); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/types/ListPaymentMethodsResponse.java b/src/main/java/com/schematic/api/resources/billing/types/ListPaymentMethodsResponse.java index c21b391..4ff9076 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/ListPaymentMethodsResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/ListPaymentMethodsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListPaymentMethodsResponse.Builder.class) public final class ListPaymentMethodsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/ListProductPricesParams.java b/src/main/java/com/schematic/api/resources/billing/types/ListProductPricesParams.java index ae56cef..4b6415e 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/ListProductPricesParams.java +++ b/src/main/java/com/schematic/api/resources/billing/types/ListProductPricesParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListProductPricesParams.Builder.class) public final class ListProductPricesParams { private final Optional> ids; @@ -215,7 +215,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -226,7 +226,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -237,7 +237,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -248,7 +248,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -259,7 +259,7 @@ public Builder priceUsageType(Optional priceUsageType) { } public Builder priceUsageType(String priceUsageType) { - this.priceUsageType = Optional.of(priceUsageType); + this.priceUsageType = Optional.ofNullable(priceUsageType); return this; } @@ -270,7 +270,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -281,7 +281,7 @@ public Builder withPricesOnly(Optional withPricesOnly) { } public Builder withPricesOnly(Boolean withPricesOnly) { - this.withPricesOnly = Optional.of(withPricesOnly); + this.withPricesOnly = Optional.ofNullable(withPricesOnly); return this; } @@ -292,7 +292,7 @@ public Builder withZeroPrice(Optional withZeroPrice) { } public Builder withZeroPrice(Boolean withZeroPrice) { - this.withZeroPrice = Optional.of(withZeroPrice); + this.withZeroPrice = Optional.ofNullable(withZeroPrice); return this; } @@ -303,7 +303,7 @@ public Builder withoutLinkedToPlan(Optional withoutLinkedToPlan) { } public Builder withoutLinkedToPlan(Boolean withoutLinkedToPlan) { - this.withoutLinkedToPlan = Optional.of(withoutLinkedToPlan); + this.withoutLinkedToPlan = Optional.ofNullable(withoutLinkedToPlan); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/types/ListProductPricesResponse.java b/src/main/java/com/schematic/api/resources/billing/types/ListProductPricesResponse.java index e69955b..0d20103 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/ListProductPricesResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/ListProductPricesResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListProductPricesResponse.Builder.class) public final class ListProductPricesResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/SearchBillingPricesParams.java b/src/main/java/com/schematic/api/resources/billing/types/SearchBillingPricesParams.java index 559f0ee..cfff8c4 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/SearchBillingPricesParams.java +++ b/src/main/java/com/schematic/api/resources/billing/types/SearchBillingPricesParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = SearchBillingPricesParams.Builder.class) public final class SearchBillingPricesParams { private final Optional> ids; @@ -158,7 +158,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -169,7 +169,7 @@ public Builder interval(Optional interval) { } public Builder interval(String interval) { - this.interval = Optional.of(interval); + this.interval = Optional.ofNullable(interval); return this; } @@ -180,7 +180,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -191,7 +191,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -202,7 +202,7 @@ public Builder price(Optional price) { } public Builder price(Integer price) { - this.price = Optional.of(price); + this.price = Optional.ofNullable(price); return this; } @@ -213,7 +213,7 @@ public Builder usageType(Optional usageType) { } public Builder usageType(String usageType) { - this.usageType = Optional.of(usageType); + this.usageType = Optional.ofNullable(usageType); return this; } diff --git a/src/main/java/com/schematic/api/resources/billing/types/SearchBillingPricesResponse.java b/src/main/java/com/schematic/api/resources/billing/types/SearchBillingPricesResponse.java index f76895f..ad11040 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/SearchBillingPricesResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/SearchBillingPricesResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = SearchBillingPricesResponse.Builder.class) public final class SearchBillingPricesResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingCouponResponse.java b/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingCouponResponse.java new file mode 100644 index 0000000..b9d9f89 --- /dev/null +++ b/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingCouponResponse.java @@ -0,0 +1,154 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.resources.billing.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import com.schematic.api.types.BillingCouponResponseData; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = UpsertBillingCouponResponse.Builder.class) +public final class UpsertBillingCouponResponse { + private final BillingCouponResponseData data; + + private final Map params; + + private final Map additionalProperties; + + private UpsertBillingCouponResponse( + BillingCouponResponseData data, Map params, Map additionalProperties) { + this.data = data; + this.params = params; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("data") + public BillingCouponResponseData getData() { + return data; + } + + /** + * @return Input parameters + */ + @JsonProperty("params") + public Map getParams() { + return params; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof UpsertBillingCouponResponse && equalTo((UpsertBillingCouponResponse) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(UpsertBillingCouponResponse other) { + return data.equals(other.data) && params.equals(other.params); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.data, this.params); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static DataStage builder() { + return new Builder(); + } + + public interface DataStage { + _FinalStage data(BillingCouponResponseData data); + + Builder from(UpsertBillingCouponResponse other); + } + + public interface _FinalStage { + UpsertBillingCouponResponse build(); + + _FinalStage params(Map params); + + _FinalStage putAllParams(Map params); + + _FinalStage params(String key, JsonNode value); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder implements DataStage, _FinalStage { + private BillingCouponResponseData data; + + private Map params = new LinkedHashMap<>(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(UpsertBillingCouponResponse other) { + data(other.getData()); + params(other.getParams()); + return this; + } + + @java.lang.Override + @JsonSetter("data") + public _FinalStage data(BillingCouponResponseData data) { + this.data = data; + return this; + } + + /** + *

Input parameters

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + public _FinalStage params(String key, JsonNode value) { + this.params.put(key, value); + return this; + } + + /** + *

Input parameters

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + public _FinalStage putAllParams(Map params) { + this.params.putAll(params); + return this; + } + + @java.lang.Override + @JsonSetter(value = "params", nulls = Nulls.SKIP) + public _FinalStage params(Map params) { + this.params.clear(); + this.params.putAll(params); + return this; + } + + @java.lang.Override + public UpsertBillingCouponResponse build() { + return new UpsertBillingCouponResponse(data, params, additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingCustomerResponse.java b/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingCustomerResponse.java index a94f040..adbf1d9 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingCustomerResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingCustomerResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertBillingCustomerResponse.Builder.class) public final class UpsertBillingCustomerResponse { private final BillingCustomerResponseData data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingMeterResponse.java b/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingMeterResponse.java index d2d0054..89977e9 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingMeterResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingMeterResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertBillingMeterResponse.Builder.class) public final class UpsertBillingMeterResponse { private final BillingMeterResponseData data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingPriceResponse.java b/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingPriceResponse.java index e26e089..f709f86 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingPriceResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingPriceResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertBillingPriceResponse.Builder.class) public final class UpsertBillingPriceResponse { private final BillingPriceResponseData data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingProductResponse.java b/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingProductResponse.java index 25bc1d3..8df5ae9 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingProductResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingProductResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertBillingProductResponse.Builder.class) public final class UpsertBillingProductResponse { private final BillingProductResponseData data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingSubscriptionResponse.java b/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingSubscriptionResponse.java index 26db20b..b99cfe0 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingSubscriptionResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/UpsertBillingSubscriptionResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertBillingSubscriptionResponse.Builder.class) public final class UpsertBillingSubscriptionResponse { private final BillingSubscriptionResponseData data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/UpsertInvoiceResponse.java b/src/main/java/com/schematic/api/resources/billing/types/UpsertInvoiceResponse.java index ab463f0..5211654 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/UpsertInvoiceResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/UpsertInvoiceResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertInvoiceResponse.Builder.class) public final class UpsertInvoiceResponse { private final InvoiceResponseData data; diff --git a/src/main/java/com/schematic/api/resources/billing/types/UpsertPaymentMethodResponse.java b/src/main/java/com/schematic/api/resources/billing/types/UpsertPaymentMethodResponse.java index 485b60a..7062aa5 100644 --- a/src/main/java/com/schematic/api/resources/billing/types/UpsertPaymentMethodResponse.java +++ b/src/main/java/com/schematic/api/resources/billing/types/UpsertPaymentMethodResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertPaymentMethodResponse.Builder.class) public final class UpsertPaymentMethodResponse { private final PaymentMethodResponseData data; diff --git a/src/main/java/com/schematic/api/resources/checkout/CheckoutClient.java b/src/main/java/com/schematic/api/resources/checkout/CheckoutClient.java new file mode 100644 index 0000000..240869d --- /dev/null +++ b/src/main/java/com/schematic/api/resources/checkout/CheckoutClient.java @@ -0,0 +1,232 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.resources.checkout; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.schematic.api.core.BaseSchematicApiException; +import com.schematic.api.core.BaseSchematicException; +import com.schematic.api.core.ClientOptions; +import com.schematic.api.core.MediaTypes; +import com.schematic.api.core.ObjectMappers; +import com.schematic.api.core.RequestOptions; +import com.schematic.api.errors.BadRequestError; +import com.schematic.api.errors.ForbiddenError; +import com.schematic.api.errors.InternalServerError; +import com.schematic.api.errors.NotFoundError; +import com.schematic.api.errors.UnauthorizedError; +import com.schematic.api.resources.checkout.requests.UpdateTrialEndRequestBody; +import com.schematic.api.resources.checkout.types.CheckoutInternalResponse; +import com.schematic.api.resources.checkout.types.PreviewCheckoutInternalResponse; +import com.schematic.api.resources.checkout.types.UpdateCustomerSubscriptionTrialEndResponse; +import com.schematic.api.types.ApiError; +import com.schematic.api.types.ChangeSubscriptionInternalRequestBody; +import java.io.IOException; +import okhttp3.Headers; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; +import okhttp3.ResponseBody; + +public class CheckoutClient { + protected final ClientOptions clientOptions; + + public CheckoutClient(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + } + + public CheckoutInternalResponse internal(ChangeSubscriptionInternalRequestBody request) { + return internal(request, null); + } + + public CheckoutInternalResponse internal( + ChangeSubscriptionInternalRequestBody request, RequestOptions requestOptions) { + HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) + .newBuilder() + .addPathSegments("checkout-internal") + .build(); + RequestBody body; + try { + body = RequestBody.create( + ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); + } catch (JsonProcessingException e) { + throw new BaseSchematicException("Failed to serialize request", e); + } + Request okhttpRequest = new Request.Builder() + .url(httpUrl) + .method("POST", body) + .headers(Headers.of(clientOptions.headers(requestOptions))) + .addHeader("Content-Type", "application/json") + .build(); + OkHttpClient client = clientOptions.httpClient(); + if (requestOptions != null && requestOptions.getTimeout().isPresent()) { + client = clientOptions.httpClientWithTimeout(requestOptions); + } + try (Response response = client.newCall(okhttpRequest).execute()) { + ResponseBody responseBody = response.body(); + if (response.isSuccessful()) { + return ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), CheckoutInternalResponse.class); + } + String responseBodyString = responseBody != null ? responseBody.string() : "{}"; + try { + switch (response.code()) { + case 400: + throw new BadRequestError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 401: + throw new UnauthorizedError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 403: + throw new ForbiddenError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 500: + throw new InternalServerError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + } + } catch (JsonProcessingException ignored) { + // unable to map error response, throwing generic error + } + throw new BaseSchematicApiException( + "Error with status code " + response.code(), + response.code(), + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class)); + } catch (IOException e) { + throw new BaseSchematicException("Network error executing HTTP request", e); + } + } + + public PreviewCheckoutInternalResponse previewCheckoutInternal(ChangeSubscriptionInternalRequestBody request) { + return previewCheckoutInternal(request, null); + } + + public PreviewCheckoutInternalResponse previewCheckoutInternal( + ChangeSubscriptionInternalRequestBody request, RequestOptions requestOptions) { + HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) + .newBuilder() + .addPathSegments("checkout-internal/preview") + .build(); + RequestBody body; + try { + body = RequestBody.create( + ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); + } catch (JsonProcessingException e) { + throw new BaseSchematicException("Failed to serialize request", e); + } + Request okhttpRequest = new Request.Builder() + .url(httpUrl) + .method("POST", body) + .headers(Headers.of(clientOptions.headers(requestOptions))) + .addHeader("Content-Type", "application/json") + .build(); + OkHttpClient client = clientOptions.httpClient(); + if (requestOptions != null && requestOptions.getTimeout().isPresent()) { + client = clientOptions.httpClientWithTimeout(requestOptions); + } + try (Response response = client.newCall(okhttpRequest).execute()) { + ResponseBody responseBody = response.body(); + if (response.isSuccessful()) { + return ObjectMappers.JSON_MAPPER.readValue( + responseBody.string(), PreviewCheckoutInternalResponse.class); + } + String responseBodyString = responseBody != null ? responseBody.string() : "{}"; + try { + switch (response.code()) { + case 400: + throw new BadRequestError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 401: + throw new UnauthorizedError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 403: + throw new ForbiddenError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 500: + throw new InternalServerError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + } + } catch (JsonProcessingException ignored) { + // unable to map error response, throwing generic error + } + throw new BaseSchematicApiException( + "Error with status code " + response.code(), + response.code(), + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class)); + } catch (IOException e) { + throw new BaseSchematicException("Network error executing HTTP request", e); + } + } + + public UpdateCustomerSubscriptionTrialEndResponse updateCustomerSubscriptionTrialEnd(String subscriptionId) { + return updateCustomerSubscriptionTrialEnd( + subscriptionId, UpdateTrialEndRequestBody.builder().build()); + } + + public UpdateCustomerSubscriptionTrialEndResponse updateCustomerSubscriptionTrialEnd( + String subscriptionId, UpdateTrialEndRequestBody request) { + return updateCustomerSubscriptionTrialEnd(subscriptionId, request, null); + } + + public UpdateCustomerSubscriptionTrialEndResponse updateCustomerSubscriptionTrialEnd( + String subscriptionId, UpdateTrialEndRequestBody request, RequestOptions requestOptions) { + HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) + .newBuilder() + .addPathSegments("subscription") + .addPathSegment(subscriptionId) + .addPathSegments("edit-trial-end") + .build(); + RequestBody body; + try { + body = RequestBody.create( + ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); + } catch (JsonProcessingException e) { + throw new BaseSchematicException("Failed to serialize request", e); + } + Request okhttpRequest = new Request.Builder() + .url(httpUrl) + .method("PUT", body) + .headers(Headers.of(clientOptions.headers(requestOptions))) + .addHeader("Content-Type", "application/json") + .build(); + OkHttpClient client = clientOptions.httpClient(); + if (requestOptions != null && requestOptions.getTimeout().isPresent()) { + client = clientOptions.httpClientWithTimeout(requestOptions); + } + try (Response response = client.newCall(okhttpRequest).execute()) { + ResponseBody responseBody = response.body(); + if (response.isSuccessful()) { + return ObjectMappers.JSON_MAPPER.readValue( + responseBody.string(), UpdateCustomerSubscriptionTrialEndResponse.class); + } + String responseBodyString = responseBody != null ? responseBody.string() : "{}"; + try { + switch (response.code()) { + case 400: + throw new BadRequestError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 401: + throw new UnauthorizedError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 403: + throw new ForbiddenError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 404: + throw new NotFoundError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + case 500: + throw new InternalServerError( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ApiError.class)); + } + } catch (JsonProcessingException ignored) { + // unable to map error response, throwing generic error + } + throw new BaseSchematicApiException( + "Error with status code " + response.code(), + response.code(), + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class)); + } catch (IOException e) { + throw new BaseSchematicException("Network error executing HTTP request", e); + } + } +} diff --git a/src/main/java/com/schematic/api/resources/checkout/requests/UpdateTrialEndRequestBody.java b/src/main/java/com/schematic/api/resources/checkout/requests/UpdateTrialEndRequestBody.java new file mode 100644 index 0000000..1e01657 --- /dev/null +++ b/src/main/java/com/schematic/api/resources/checkout/requests/UpdateTrialEndRequestBody.java @@ -0,0 +1,96 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.resources.checkout.requests; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = UpdateTrialEndRequestBody.Builder.class) +public final class UpdateTrialEndRequestBody { + private final Optional trialEnd; + + private final Map additionalProperties; + + private UpdateTrialEndRequestBody(Optional trialEnd, Map additionalProperties) { + this.trialEnd = trialEnd; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("trial_end") + public Optional getTrialEnd() { + return trialEnd; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof UpdateTrialEndRequestBody && equalTo((UpdateTrialEndRequestBody) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(UpdateTrialEndRequestBody other) { + return trialEnd.equals(other.trialEnd); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.trialEnd); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static Builder builder() { + return new Builder(); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder { + private Optional trialEnd = Optional.empty(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + public Builder from(UpdateTrialEndRequestBody other) { + trialEnd(other.getTrialEnd()); + return this; + } + + @JsonSetter(value = "trial_end", nulls = Nulls.SKIP) + public Builder trialEnd(Optional trialEnd) { + this.trialEnd = trialEnd; + return this; + } + + public Builder trialEnd(OffsetDateTime trialEnd) { + this.trialEnd = Optional.ofNullable(trialEnd); + return this; + } + + public UpdateTrialEndRequestBody build() { + return new UpdateTrialEndRequestBody(trialEnd, additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/resources/checkout/types/CheckoutInternalResponse.java b/src/main/java/com/schematic/api/resources/checkout/types/CheckoutInternalResponse.java new file mode 100644 index 0000000..5c6b70b --- /dev/null +++ b/src/main/java/com/schematic/api/resources/checkout/types/CheckoutInternalResponse.java @@ -0,0 +1,156 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.resources.checkout.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import com.schematic.api.types.BillingSubscriptionResponseData; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = CheckoutInternalResponse.Builder.class) +public final class CheckoutInternalResponse { + private final BillingSubscriptionResponseData data; + + private final Map params; + + private final Map additionalProperties; + + private CheckoutInternalResponse( + BillingSubscriptionResponseData data, + Map params, + Map additionalProperties) { + this.data = data; + this.params = params; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("data") + public BillingSubscriptionResponseData getData() { + return data; + } + + /** + * @return Input parameters + */ + @JsonProperty("params") + public Map getParams() { + return params; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof CheckoutInternalResponse && equalTo((CheckoutInternalResponse) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(CheckoutInternalResponse other) { + return data.equals(other.data) && params.equals(other.params); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.data, this.params); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static DataStage builder() { + return new Builder(); + } + + public interface DataStage { + _FinalStage data(BillingSubscriptionResponseData data); + + Builder from(CheckoutInternalResponse other); + } + + public interface _FinalStage { + CheckoutInternalResponse build(); + + _FinalStage params(Map params); + + _FinalStage putAllParams(Map params); + + _FinalStage params(String key, JsonNode value); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder implements DataStage, _FinalStage { + private BillingSubscriptionResponseData data; + + private Map params = new LinkedHashMap<>(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(CheckoutInternalResponse other) { + data(other.getData()); + params(other.getParams()); + return this; + } + + @java.lang.Override + @JsonSetter("data") + public _FinalStage data(BillingSubscriptionResponseData data) { + this.data = data; + return this; + } + + /** + *

Input parameters

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + public _FinalStage params(String key, JsonNode value) { + this.params.put(key, value); + return this; + } + + /** + *

Input parameters

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + public _FinalStage putAllParams(Map params) { + this.params.putAll(params); + return this; + } + + @java.lang.Override + @JsonSetter(value = "params", nulls = Nulls.SKIP) + public _FinalStage params(Map params) { + this.params.clear(); + this.params.putAll(params); + return this; + } + + @java.lang.Override + public CheckoutInternalResponse build() { + return new CheckoutInternalResponse(data, params, additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/resources/checkout/types/PreviewCheckoutInternalResponse.java b/src/main/java/com/schematic/api/resources/checkout/types/PreviewCheckoutInternalResponse.java new file mode 100644 index 0000000..e59e9ea --- /dev/null +++ b/src/main/java/com/schematic/api/resources/checkout/types/PreviewCheckoutInternalResponse.java @@ -0,0 +1,156 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.resources.checkout.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import com.schematic.api.types.PreviewSubscriptionChangeResponseData; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = PreviewCheckoutInternalResponse.Builder.class) +public final class PreviewCheckoutInternalResponse { + private final PreviewSubscriptionChangeResponseData data; + + private final Map params; + + private final Map additionalProperties; + + private PreviewCheckoutInternalResponse( + PreviewSubscriptionChangeResponseData data, + Map params, + Map additionalProperties) { + this.data = data; + this.params = params; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("data") + public PreviewSubscriptionChangeResponseData getData() { + return data; + } + + /** + * @return Input parameters + */ + @JsonProperty("params") + public Map getParams() { + return params; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof PreviewCheckoutInternalResponse && equalTo((PreviewCheckoutInternalResponse) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(PreviewCheckoutInternalResponse other) { + return data.equals(other.data) && params.equals(other.params); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.data, this.params); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static DataStage builder() { + return new Builder(); + } + + public interface DataStage { + _FinalStage data(PreviewSubscriptionChangeResponseData data); + + Builder from(PreviewCheckoutInternalResponse other); + } + + public interface _FinalStage { + PreviewCheckoutInternalResponse build(); + + _FinalStage params(Map params); + + _FinalStage putAllParams(Map params); + + _FinalStage params(String key, JsonNode value); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder implements DataStage, _FinalStage { + private PreviewSubscriptionChangeResponseData data; + + private Map params = new LinkedHashMap<>(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(PreviewCheckoutInternalResponse other) { + data(other.getData()); + params(other.getParams()); + return this; + } + + @java.lang.Override + @JsonSetter("data") + public _FinalStage data(PreviewSubscriptionChangeResponseData data) { + this.data = data; + return this; + } + + /** + *

Input parameters

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + public _FinalStage params(String key, JsonNode value) { + this.params.put(key, value); + return this; + } + + /** + *

Input parameters

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + public _FinalStage putAllParams(Map params) { + this.params.putAll(params); + return this; + } + + @java.lang.Override + @JsonSetter(value = "params", nulls = Nulls.SKIP) + public _FinalStage params(Map params) { + this.params.clear(); + this.params.putAll(params); + return this; + } + + @java.lang.Override + public PreviewCheckoutInternalResponse build() { + return new PreviewCheckoutInternalResponse(data, params, additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/resources/checkout/types/UpdateCustomerSubscriptionTrialEndResponse.java b/src/main/java/com/schematic/api/resources/checkout/types/UpdateCustomerSubscriptionTrialEndResponse.java new file mode 100644 index 0000000..dc46eee --- /dev/null +++ b/src/main/java/com/schematic/api/resources/checkout/types/UpdateCustomerSubscriptionTrialEndResponse.java @@ -0,0 +1,155 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.resources.checkout.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import com.schematic.api.types.BillingSubscriptionView; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = UpdateCustomerSubscriptionTrialEndResponse.Builder.class) +public final class UpdateCustomerSubscriptionTrialEndResponse { + private final BillingSubscriptionView data; + + private final Map params; + + private final Map additionalProperties; + + private UpdateCustomerSubscriptionTrialEndResponse( + BillingSubscriptionView data, Map params, Map additionalProperties) { + this.data = data; + this.params = params; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("data") + public BillingSubscriptionView getData() { + return data; + } + + /** + * @return Input parameters + */ + @JsonProperty("params") + public Map getParams() { + return params; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof UpdateCustomerSubscriptionTrialEndResponse + && equalTo((UpdateCustomerSubscriptionTrialEndResponse) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(UpdateCustomerSubscriptionTrialEndResponse other) { + return data.equals(other.data) && params.equals(other.params); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.data, this.params); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static DataStage builder() { + return new Builder(); + } + + public interface DataStage { + _FinalStage data(BillingSubscriptionView data); + + Builder from(UpdateCustomerSubscriptionTrialEndResponse other); + } + + public interface _FinalStage { + UpdateCustomerSubscriptionTrialEndResponse build(); + + _FinalStage params(Map params); + + _FinalStage putAllParams(Map params); + + _FinalStage params(String key, JsonNode value); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder implements DataStage, _FinalStage { + private BillingSubscriptionView data; + + private Map params = new LinkedHashMap<>(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(UpdateCustomerSubscriptionTrialEndResponse other) { + data(other.getData()); + params(other.getParams()); + return this; + } + + @java.lang.Override + @JsonSetter("data") + public _FinalStage data(BillingSubscriptionView data) { + this.data = data; + return this; + } + + /** + *

Input parameters

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + public _FinalStage params(String key, JsonNode value) { + this.params.put(key, value); + return this; + } + + /** + *

Input parameters

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + public _FinalStage putAllParams(Map params) { + this.params.putAll(params); + return this; + } + + @java.lang.Override + @JsonSetter(value = "params", nulls = Nulls.SKIP) + public _FinalStage params(Map params) { + this.params.clear(); + this.params.putAll(params); + return this; + } + + @java.lang.Override + public UpdateCustomerSubscriptionTrialEndResponse build() { + return new UpdateCustomerSubscriptionTrialEndResponse(data, params, additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/resources/companies/requests/CountCompaniesRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/CountCompaniesRequest.java index 3e0beb4..6e7fe39 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/CountCompaniesRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/CountCompaniesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountCompaniesRequest.Builder.class) public final class CountCompaniesRequest { private final Optional ids; @@ -192,7 +192,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -203,7 +203,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -214,7 +214,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -225,7 +225,7 @@ public Builder withoutFeatureOverrideFor(Optional withoutFeatureOverride } public Builder withoutFeatureOverrideFor(String withoutFeatureOverrideFor) { - this.withoutFeatureOverrideFor = Optional.of(withoutFeatureOverrideFor); + this.withoutFeatureOverrideFor = Optional.ofNullable(withoutFeatureOverrideFor); return this; } @@ -236,7 +236,7 @@ public Builder withoutPlan(Optional withoutPlan) { } public Builder withoutPlan(Boolean withoutPlan) { - this.withoutPlan = Optional.of(withoutPlan); + this.withoutPlan = Optional.ofNullable(withoutPlan); return this; } @@ -247,7 +247,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -258,7 +258,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/CountEntityKeyDefinitionsRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/CountEntityKeyDefinitionsRequest.java index 3f42ed6..f420f8a 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/CountEntityKeyDefinitionsRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/CountEntityKeyDefinitionsRequest.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountEntityKeyDefinitionsRequest.Builder.class) public final class CountEntityKeyDefinitionsRequest { private final Optional entityType; @@ -145,7 +145,7 @@ public Builder entityType(Optional e } public Builder entityType(CountEntityKeyDefinitionsRequestEntityType entityType) { - this.entityType = Optional.of(entityType); + this.entityType = Optional.ofNullable(entityType); return this; } @@ -156,7 +156,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -167,7 +167,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -178,7 +178,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -189,7 +189,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/CountEntityTraitDefinitionsRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/CountEntityTraitDefinitionsRequest.java index fceead4..8bffa4b 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/CountEntityTraitDefinitionsRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/CountEntityTraitDefinitionsRequest.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountEntityTraitDefinitionsRequest.Builder.class) public final class CountEntityTraitDefinitionsRequest { private final Optional entityType; @@ -160,7 +160,7 @@ public Builder entityType(Optional } public Builder entityType(CountEntityTraitDefinitionsRequestEntityType entityType) { - this.entityType = Optional.of(entityType); + this.entityType = Optional.ofNullable(entityType); return this; } @@ -171,7 +171,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -182,7 +182,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -193,7 +193,7 @@ public Builder traitType(Optional t } public Builder traitType(CountEntityTraitDefinitionsRequestTraitType traitType) { - this.traitType = Optional.of(traitType); + this.traitType = Optional.ofNullable(traitType); return this; } @@ -204,7 +204,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -215,7 +215,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/CountUsersRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/CountUsersRequest.java index 42f45f6..0f95ab1 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/CountUsersRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/CountUsersRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountUsersRequest.Builder.class) public final class CountUsersRequest { private final Optional companyId; @@ -169,7 +169,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -180,7 +180,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -191,7 +191,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -202,7 +202,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -213,7 +213,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -224,7 +224,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/CreateEntityTraitDefinitionRequestBody.java b/src/main/java/com/schematic/api/resources/companies/requests/CreateEntityTraitDefinitionRequestBody.java index 04a0987..4701e7f 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/CreateEntityTraitDefinitionRequestBody.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/CreateEntityTraitDefinitionRequestBody.java @@ -21,7 +21,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateEntityTraitDefinitionRequestBody.Builder.class) public final class CreateEntityTraitDefinitionRequestBody { private final Optional displayName; @@ -184,7 +184,7 @@ public _FinalStage hierarchy(List hierarchy) { @java.lang.Override public _FinalStage displayName(String displayName) { - this.displayName = Optional.of(displayName); + this.displayName = Optional.ofNullable(displayName); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/GetActiveCompanySubscriptionRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/GetActiveCompanySubscriptionRequest.java index 34c3b98..a1cb198 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/GetActiveCompanySubscriptionRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/GetActiveCompanySubscriptionRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetActiveCompanySubscriptionRequest.Builder.class) public final class GetActiveCompanySubscriptionRequest { private final Optional companyId; @@ -132,7 +132,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -143,7 +143,7 @@ public Builder companyIds(Optional companyIds) { } public Builder companyIds(String companyIds) { - this.companyIds = Optional.of(companyIds); + this.companyIds = Optional.ofNullable(companyIds); return this; } @@ -154,7 +154,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -165,7 +165,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/GetActiveDealsRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/GetActiveDealsRequest.java index 946ce07..e164db3 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/GetActiveDealsRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/GetActiveDealsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetActiveDealsRequest.Builder.class) public final class GetActiveDealsRequest { private final String companyId; @@ -167,7 +167,7 @@ public _FinalStage dealStage(String dealStage) { */ @java.lang.Override public _FinalStage offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -184,7 +184,7 @@ public _FinalStage offset(Optional offset) { */ @java.lang.Override public _FinalStage limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/GetEntityTraitValuesRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/GetEntityTraitValuesRequest.java index 1568bdb..8046d45 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/GetEntityTraitValuesRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/GetEntityTraitValuesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetEntityTraitValuesRequest.Builder.class) public final class GetEntityTraitValuesRequest { private final String definitionId; @@ -160,7 +160,7 @@ public _FinalStage definitionId(String definitionId) { */ @java.lang.Override public _FinalStage offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -177,7 +177,7 @@ public _FinalStage offset(Optional offset) { */ @java.lang.Override public _FinalStage limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -190,7 +190,7 @@ public _FinalStage limit(Optional limit) { @java.lang.Override public _FinalStage q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/GetOrCreateCompanyMembershipRequestBody.java b/src/main/java/com/schematic/api/resources/companies/requests/GetOrCreateCompanyMembershipRequestBody.java index 70d434c..29f0367 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/GetOrCreateCompanyMembershipRequestBody.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/GetOrCreateCompanyMembershipRequestBody.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetOrCreateCompanyMembershipRequestBody.Builder.class) public final class GetOrCreateCompanyMembershipRequestBody { private final String companyId; diff --git a/src/main/java/com/schematic/api/resources/companies/requests/ListCompaniesRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/ListCompaniesRequest.java index 434c90d..e278c03 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/ListCompaniesRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/ListCompaniesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCompaniesRequest.Builder.class) public final class ListCompaniesRequest { private final Optional ids; @@ -192,7 +192,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -203,7 +203,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -214,7 +214,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -225,7 +225,7 @@ public Builder withoutFeatureOverrideFor(Optional withoutFeatureOverride } public Builder withoutFeatureOverrideFor(String withoutFeatureOverrideFor) { - this.withoutFeatureOverrideFor = Optional.of(withoutFeatureOverrideFor); + this.withoutFeatureOverrideFor = Optional.ofNullable(withoutFeatureOverrideFor); return this; } @@ -236,7 +236,7 @@ public Builder withoutPlan(Optional withoutPlan) { } public Builder withoutPlan(Boolean withoutPlan) { - this.withoutPlan = Optional.of(withoutPlan); + this.withoutPlan = Optional.ofNullable(withoutPlan); return this; } @@ -247,7 +247,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -258,7 +258,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/ListCompanyMembershipsRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/ListCompanyMembershipsRequest.java index 3c7de91..81f737a 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/ListCompanyMembershipsRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/ListCompanyMembershipsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCompanyMembershipsRequest.Builder.class) public final class ListCompanyMembershipsRequest { private final Optional companyId; @@ -131,7 +131,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -142,7 +142,7 @@ public Builder userId(Optional userId) { } public Builder userId(String userId) { - this.userId = Optional.of(userId); + this.userId = Optional.ofNullable(userId); return this; } @@ -153,7 +153,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -164,7 +164,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/ListEntityKeyDefinitionsRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/ListEntityKeyDefinitionsRequest.java index 6d8e841..c6dcd04 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/ListEntityKeyDefinitionsRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/ListEntityKeyDefinitionsRequest.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListEntityKeyDefinitionsRequest.Builder.class) public final class ListEntityKeyDefinitionsRequest { private final Optional entityType; @@ -145,7 +145,7 @@ public Builder entityType(Optional en } public Builder entityType(ListEntityKeyDefinitionsRequestEntityType entityType) { - this.entityType = Optional.of(entityType); + this.entityType = Optional.ofNullable(entityType); return this; } @@ -156,7 +156,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -167,7 +167,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -178,7 +178,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -189,7 +189,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/ListEntityTraitDefinitionsRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/ListEntityTraitDefinitionsRequest.java index 40477ee..c279e6d 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/ListEntityTraitDefinitionsRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/ListEntityTraitDefinitionsRequest.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListEntityTraitDefinitionsRequest.Builder.class) public final class ListEntityTraitDefinitionsRequest { private final Optional entityType; @@ -159,7 +159,7 @@ public Builder entityType(Optional } public Builder entityType(ListEntityTraitDefinitionsRequestEntityType entityType) { - this.entityType = Optional.of(entityType); + this.entityType = Optional.ofNullable(entityType); return this; } @@ -170,7 +170,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -181,7 +181,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -192,7 +192,7 @@ public Builder traitType(Optional tr } public Builder traitType(ListEntityTraitDefinitionsRequestTraitType traitType) { - this.traitType = Optional.of(traitType); + this.traitType = Optional.ofNullable(traitType); return this; } @@ -203,7 +203,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -214,7 +214,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/ListUsersRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/ListUsersRequest.java index 50da771..9fc95fe 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/ListUsersRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/ListUsersRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListUsersRequest.Builder.class) public final class ListUsersRequest { private final Optional companyId; @@ -169,7 +169,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -180,7 +180,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -191,7 +191,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -202,7 +202,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -213,7 +213,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -224,7 +224,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/requests/LookupCompanyRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/LookupCompanyRequest.java index 47d823e..d1dde2a 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/LookupCompanyRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/LookupCompanyRequest.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = LookupCompanyRequest.Builder.class) public final class LookupCompanyRequest { private final Map keys; diff --git a/src/main/java/com/schematic/api/resources/companies/requests/LookupUserRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/LookupUserRequest.java index 4db5747..c24f4e7 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/LookupUserRequest.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/LookupUserRequest.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = LookupUserRequest.Builder.class) public final class LookupUserRequest { private final Map keys; diff --git a/src/main/java/com/schematic/api/resources/companies/requests/UpdateEntityTraitDefinitionRequestBody.java b/src/main/java/com/schematic/api/resources/companies/requests/UpdateEntityTraitDefinitionRequestBody.java index e003f51..57495de 100644 --- a/src/main/java/com/schematic/api/resources/companies/requests/UpdateEntityTraitDefinitionRequestBody.java +++ b/src/main/java/com/schematic/api/resources/companies/requests/UpdateEntityTraitDefinitionRequestBody.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateEntityTraitDefinitionRequestBody.Builder.class) public final class UpdateEntityTraitDefinitionRequestBody { private final Optional displayName; @@ -117,7 +117,7 @@ public _FinalStage traitType(UpdateEntityTraitDefinitionRequestBodyTraitType tra @java.lang.Override public _FinalStage displayName(String displayName) { - this.displayName = Optional.of(displayName); + this.displayName = Optional.ofNullable(displayName); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/CountCompaniesParams.java b/src/main/java/com/schematic/api/resources/companies/types/CountCompaniesParams.java index 321958f..1cad4b1 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/CountCompaniesParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/CountCompaniesParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountCompaniesParams.Builder.class) public final class CountCompaniesParams { private final Optional> ids; @@ -193,7 +193,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -204,7 +204,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -215,7 +215,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -226,7 +226,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -237,7 +237,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -248,7 +248,7 @@ public Builder withoutFeatureOverrideFor(Optional withoutFeatureOverride } public Builder withoutFeatureOverrideFor(String withoutFeatureOverrideFor) { - this.withoutFeatureOverrideFor = Optional.of(withoutFeatureOverrideFor); + this.withoutFeatureOverrideFor = Optional.ofNullable(withoutFeatureOverrideFor); return this; } @@ -259,7 +259,7 @@ public Builder withoutPlan(Optional withoutPlan) { } public Builder withoutPlan(Boolean withoutPlan) { - this.withoutPlan = Optional.of(withoutPlan); + this.withoutPlan = Optional.ofNullable(withoutPlan); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/CountCompaniesResponse.java b/src/main/java/com/schematic/api/resources/companies/types/CountCompaniesResponse.java index 909380a..41c2d44 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/CountCompaniesResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/CountCompaniesResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountCompaniesResponse.Builder.class) public final class CountCompaniesResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/CountEntityKeyDefinitionsParams.java b/src/main/java/com/schematic/api/resources/companies/types/CountEntityKeyDefinitionsParams.java index f881490..b0418a9 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/CountEntityKeyDefinitionsParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/CountEntityKeyDefinitionsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountEntityKeyDefinitionsParams.Builder.class) public final class CountEntityKeyDefinitionsParams { private final Optional entityType; @@ -145,7 +145,7 @@ public Builder entityType(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -167,7 +167,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -178,7 +178,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -189,7 +189,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/CountEntityKeyDefinitionsResponse.java b/src/main/java/com/schematic/api/resources/companies/types/CountEntityKeyDefinitionsResponse.java index 9dd753a..b59beda 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/CountEntityKeyDefinitionsResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/CountEntityKeyDefinitionsResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountEntityKeyDefinitionsResponse.Builder.class) public final class CountEntityKeyDefinitionsResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/CountEntityTraitDefinitionsParams.java b/src/main/java/com/schematic/api/resources/companies/types/CountEntityTraitDefinitionsParams.java index b76f286..58f6d96 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/CountEntityTraitDefinitionsParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/CountEntityTraitDefinitionsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountEntityTraitDefinitionsParams.Builder.class) public final class CountEntityTraitDefinitionsParams { private final Optional entityType; @@ -158,7 +158,7 @@ public Builder entityType(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -180,7 +180,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -191,7 +191,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -202,7 +202,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -213,7 +213,7 @@ public Builder traitType(Optional companyId; @@ -170,7 +170,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -181,7 +181,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -192,7 +192,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -203,7 +203,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -214,7 +214,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -225,7 +225,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/CountUsersResponse.java b/src/main/java/com/schematic/api/resources/companies/types/CountUsersResponse.java index dc6bb09..678cf9c 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/CountUsersResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/CountUsersResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountUsersResponse.Builder.class) public final class CountUsersResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/CreateCompanyResponse.java b/src/main/java/com/schematic/api/resources/companies/types/CreateCompanyResponse.java index ba91761..caea4a1 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/CreateCompanyResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/CreateCompanyResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateCompanyResponse.Builder.class) public final class CreateCompanyResponse { private final CompanyDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/CreateUserResponse.java b/src/main/java/com/schematic/api/resources/companies/types/CreateUserResponse.java index 05a23cf..38213cb 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/CreateUserResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/CreateUserResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateUserResponse.Builder.class) public final class CreateUserResponse { private final UserDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/DeleteCompanyByKeysResponse.java b/src/main/java/com/schematic/api/resources/companies/types/DeleteCompanyByKeysResponse.java index 571f2fb..a9b245b 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/DeleteCompanyByKeysResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/DeleteCompanyByKeysResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteCompanyByKeysResponse.Builder.class) public final class DeleteCompanyByKeysResponse { private final CompanyResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/DeleteCompanyMembershipResponse.java b/src/main/java/com/schematic/api/resources/companies/types/DeleteCompanyMembershipResponse.java index 41f1a3e..640dd0f 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/DeleteCompanyMembershipResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/DeleteCompanyMembershipResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteCompanyMembershipResponse.Builder.class) public final class DeleteCompanyMembershipResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/DeleteCompanyResponse.java b/src/main/java/com/schematic/api/resources/companies/types/DeleteCompanyResponse.java index 35e429b..d2c6abb 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/DeleteCompanyResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/DeleteCompanyResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteCompanyResponse.Builder.class) public final class DeleteCompanyResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/DeleteUserByKeysResponse.java b/src/main/java/com/schematic/api/resources/companies/types/DeleteUserByKeysResponse.java index 22f0ad2..ab4b407 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/DeleteUserByKeysResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/DeleteUserByKeysResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteUserByKeysResponse.Builder.class) public final class DeleteUserByKeysResponse { private final UserResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/DeleteUserResponse.java b/src/main/java/com/schematic/api/resources/companies/types/DeleteUserResponse.java index 0c7699a..c7065fb 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/DeleteUserResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/DeleteUserResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteUserResponse.Builder.class) public final class DeleteUserResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/GetActiveCompanySubscriptionParams.java b/src/main/java/com/schematic/api/resources/companies/types/GetActiveCompanySubscriptionParams.java index cd6153f..0d9979d 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/GetActiveCompanySubscriptionParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/GetActiveCompanySubscriptionParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetActiveCompanySubscriptionParams.Builder.class) public final class GetActiveCompanySubscriptionParams { private final Optional companyId; @@ -133,7 +133,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -144,7 +144,7 @@ public Builder companyIds(Optional> companyIds) { } public Builder companyIds(List companyIds) { - this.companyIds = Optional.of(companyIds); + this.companyIds = Optional.ofNullable(companyIds); return this; } @@ -155,7 +155,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -166,7 +166,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/GetActiveCompanySubscriptionResponse.java b/src/main/java/com/schematic/api/resources/companies/types/GetActiveCompanySubscriptionResponse.java index 0f37a93..42b0954 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/GetActiveCompanySubscriptionResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/GetActiveCompanySubscriptionResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetActiveCompanySubscriptionResponse.Builder.class) public final class GetActiveCompanySubscriptionResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/GetActiveDealsParams.java b/src/main/java/com/schematic/api/resources/companies/types/GetActiveDealsParams.java index 7b8c684..39e7587 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/GetActiveDealsParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/GetActiveDealsParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetActiveDealsParams.Builder.class) public final class GetActiveDealsParams { private final Optional companyId; @@ -131,7 +131,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -142,7 +142,7 @@ public Builder dealStage(Optional dealStage) { } public Builder dealStage(String dealStage) { - this.dealStage = Optional.of(dealStage); + this.dealStage = Optional.ofNullable(dealStage); return this; } @@ -153,7 +153,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -164,7 +164,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/GetActiveDealsResponse.java b/src/main/java/com/schematic/api/resources/companies/types/GetActiveDealsResponse.java index 83b758b..b40e595 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/GetActiveDealsResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/GetActiveDealsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetActiveDealsResponse.Builder.class) public final class GetActiveDealsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/GetCompanyResponse.java b/src/main/java/com/schematic/api/resources/companies/types/GetCompanyResponse.java index aabde88..ef07381 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/GetCompanyResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/GetCompanyResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetCompanyResponse.Builder.class) public final class GetCompanyResponse { private final CompanyDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/GetEntityTraitDefinitionResponse.java b/src/main/java/com/schematic/api/resources/companies/types/GetEntityTraitDefinitionResponse.java index 48efff9..6013245 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/GetEntityTraitDefinitionResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/GetEntityTraitDefinitionResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetEntityTraitDefinitionResponse.Builder.class) public final class GetEntityTraitDefinitionResponse { private final EntityTraitDefinitionResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/GetEntityTraitValuesParams.java b/src/main/java/com/schematic/api/resources/companies/types/GetEntityTraitValuesParams.java index 8103ff1..f5c6034 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/GetEntityTraitValuesParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/GetEntityTraitValuesParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetEntityTraitValuesParams.Builder.class) public final class GetEntityTraitValuesParams { private final Optional definitionId; @@ -131,7 +131,7 @@ public Builder definitionId(Optional definitionId) { } public Builder definitionId(String definitionId) { - this.definitionId = Optional.of(definitionId); + this.definitionId = Optional.ofNullable(definitionId); return this; } @@ -142,7 +142,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -153,7 +153,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -164,7 +164,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/GetEntityTraitValuesResponse.java b/src/main/java/com/schematic/api/resources/companies/types/GetEntityTraitValuesResponse.java index ed9cf7f..00e2ca5 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/GetEntityTraitValuesResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/GetEntityTraitValuesResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetEntityTraitValuesResponse.Builder.class) public final class GetEntityTraitValuesResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/GetOrCreateCompanyMembershipResponse.java b/src/main/java/com/schematic/api/resources/companies/types/GetOrCreateCompanyMembershipResponse.java index 7dcc4f5..4b3048e 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/GetOrCreateCompanyMembershipResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/GetOrCreateCompanyMembershipResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetOrCreateCompanyMembershipResponse.Builder.class) public final class GetOrCreateCompanyMembershipResponse { private final CompanyMembershipDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/GetOrCreateEntityTraitDefinitionResponse.java b/src/main/java/com/schematic/api/resources/companies/types/GetOrCreateEntityTraitDefinitionResponse.java index 3ecc619..ef566c8 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/GetOrCreateEntityTraitDefinitionResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/GetOrCreateEntityTraitDefinitionResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetOrCreateEntityTraitDefinitionResponse.Builder.class) public final class GetOrCreateEntityTraitDefinitionResponse { private final EntityTraitDefinitionResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/GetUserResponse.java b/src/main/java/com/schematic/api/resources/companies/types/GetUserResponse.java index 235e5b2..1eb9509 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/GetUserResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/GetUserResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetUserResponse.Builder.class) public final class GetUserResponse { private final UserDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/ListCompaniesParams.java b/src/main/java/com/schematic/api/resources/companies/types/ListCompaniesParams.java index 3dbc74e..5c9fc0d 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/ListCompaniesParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/ListCompaniesParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCompaniesParams.Builder.class) public final class ListCompaniesParams { private final Optional> ids; @@ -193,7 +193,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -204,7 +204,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -215,7 +215,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -226,7 +226,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -237,7 +237,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -248,7 +248,7 @@ public Builder withoutFeatureOverrideFor(Optional withoutFeatureOverride } public Builder withoutFeatureOverrideFor(String withoutFeatureOverrideFor) { - this.withoutFeatureOverrideFor = Optional.of(withoutFeatureOverrideFor); + this.withoutFeatureOverrideFor = Optional.ofNullable(withoutFeatureOverrideFor); return this; } @@ -259,7 +259,7 @@ public Builder withoutPlan(Optional withoutPlan) { } public Builder withoutPlan(Boolean withoutPlan) { - this.withoutPlan = Optional.of(withoutPlan); + this.withoutPlan = Optional.ofNullable(withoutPlan); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/ListCompaniesResponse.java b/src/main/java/com/schematic/api/resources/companies/types/ListCompaniesResponse.java index 0e7f407..6a6fee1 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/ListCompaniesResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/ListCompaniesResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCompaniesResponse.Builder.class) public final class ListCompaniesResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/ListCompanyMembershipsParams.java b/src/main/java/com/schematic/api/resources/companies/types/ListCompanyMembershipsParams.java index 71e069c..b2288b9 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/ListCompanyMembershipsParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/ListCompanyMembershipsParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCompanyMembershipsParams.Builder.class) public final class ListCompanyMembershipsParams { private final Optional companyId; @@ -131,7 +131,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -142,7 +142,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -153,7 +153,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -164,7 +164,7 @@ public Builder userId(Optional userId) { } public Builder userId(String userId) { - this.userId = Optional.of(userId); + this.userId = Optional.ofNullable(userId); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/ListCompanyMembershipsResponse.java b/src/main/java/com/schematic/api/resources/companies/types/ListCompanyMembershipsResponse.java index 8cc1748..cba7c17 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/ListCompanyMembershipsResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/ListCompanyMembershipsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCompanyMembershipsResponse.Builder.class) public final class ListCompanyMembershipsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/ListEntityKeyDefinitionsParams.java b/src/main/java/com/schematic/api/resources/companies/types/ListEntityKeyDefinitionsParams.java index 121dc88..86ce159 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/ListEntityKeyDefinitionsParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/ListEntityKeyDefinitionsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListEntityKeyDefinitionsParams.Builder.class) public final class ListEntityKeyDefinitionsParams { private final Optional entityType; @@ -145,7 +145,7 @@ public Builder entityType(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -167,7 +167,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -178,7 +178,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -189,7 +189,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/ListEntityKeyDefinitionsResponse.java b/src/main/java/com/schematic/api/resources/companies/types/ListEntityKeyDefinitionsResponse.java index 9f21b9f..4f712b9 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/ListEntityKeyDefinitionsResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/ListEntityKeyDefinitionsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListEntityKeyDefinitionsResponse.Builder.class) public final class ListEntityKeyDefinitionsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/ListEntityTraitDefinitionsParams.java b/src/main/java/com/schematic/api/resources/companies/types/ListEntityTraitDefinitionsParams.java index 3cfabb3..fe45270 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/ListEntityTraitDefinitionsParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/ListEntityTraitDefinitionsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListEntityTraitDefinitionsParams.Builder.class) public final class ListEntityTraitDefinitionsParams { private final Optional entityType; @@ -158,7 +158,7 @@ public Builder entityType(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -180,7 +180,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -191,7 +191,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -202,7 +202,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -213,7 +213,7 @@ public Builder traitType(Optional data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/ListUsersParams.java b/src/main/java/com/schematic/api/resources/companies/types/ListUsersParams.java index c34e56e..7461225 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/ListUsersParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/ListUsersParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListUsersParams.Builder.class) public final class ListUsersParams { private final Optional companyId; @@ -170,7 +170,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -181,7 +181,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -192,7 +192,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -203,7 +203,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -214,7 +214,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -225,7 +225,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/ListUsersResponse.java b/src/main/java/com/schematic/api/resources/companies/types/ListUsersResponse.java index 6bd3f73..95a5b38 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/ListUsersResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/ListUsersResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListUsersResponse.Builder.class) public final class ListUsersResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/LookupCompanyParams.java b/src/main/java/com/schematic/api/resources/companies/types/LookupCompanyParams.java index 1fbc22f..05baddb 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/LookupCompanyParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/LookupCompanyParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = LookupCompanyParams.Builder.class) public final class LookupCompanyParams { private final Optional> keys; @@ -85,7 +85,7 @@ public Builder keys(Optional> keys) { } public Builder keys(Map keys) { - this.keys = Optional.of(keys); + this.keys = Optional.ofNullable(keys); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/LookupCompanyResponse.java b/src/main/java/com/schematic/api/resources/companies/types/LookupCompanyResponse.java index 1f6f299..63f73ba 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/LookupCompanyResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/LookupCompanyResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = LookupCompanyResponse.Builder.class) public final class LookupCompanyResponse { private final CompanyDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/LookupUserParams.java b/src/main/java/com/schematic/api/resources/companies/types/LookupUserParams.java index 4399ac1..93c2b15 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/LookupUserParams.java +++ b/src/main/java/com/schematic/api/resources/companies/types/LookupUserParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = LookupUserParams.Builder.class) public final class LookupUserParams { private final Optional> keys; @@ -85,7 +85,7 @@ public Builder keys(Optional> keys) { } public Builder keys(Map keys) { - this.keys = Optional.of(keys); + this.keys = Optional.ofNullable(keys); return this; } diff --git a/src/main/java/com/schematic/api/resources/companies/types/LookupUserResponse.java b/src/main/java/com/schematic/api/resources/companies/types/LookupUserResponse.java index 436ac98..92ee104 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/LookupUserResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/LookupUserResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = LookupUserResponse.Builder.class) public final class LookupUserResponse { private final UserDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/UpdateEntityTraitDefinitionResponse.java b/src/main/java/com/schematic/api/resources/companies/types/UpdateEntityTraitDefinitionResponse.java index d3f3da0..f8def23 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/UpdateEntityTraitDefinitionResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/UpdateEntityTraitDefinitionResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateEntityTraitDefinitionResponse.Builder.class) public final class UpdateEntityTraitDefinitionResponse { private final EntityTraitDefinitionResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/UpsertCompanyResponse.java b/src/main/java/com/schematic/api/resources/companies/types/UpsertCompanyResponse.java index 6cb390e..182f813 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/UpsertCompanyResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/UpsertCompanyResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertCompanyResponse.Builder.class) public final class UpsertCompanyResponse { private final CompanyDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/UpsertCompanyTraitResponse.java b/src/main/java/com/schematic/api/resources/companies/types/UpsertCompanyTraitResponse.java index 022ede2..68e7f8b 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/UpsertCompanyTraitResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/UpsertCompanyTraitResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertCompanyTraitResponse.Builder.class) public final class UpsertCompanyTraitResponse { private final CompanyDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/UpsertUserResponse.java b/src/main/java/com/schematic/api/resources/companies/types/UpsertUserResponse.java index a308b6e..f5bfb3b 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/UpsertUserResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/UpsertUserResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertUserResponse.Builder.class) public final class UpsertUserResponse { private final UserDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/companies/types/UpsertUserTraitResponse.java b/src/main/java/com/schematic/api/resources/companies/types/UpsertUserTraitResponse.java index cdc6b5a..3739481 100644 --- a/src/main/java/com/schematic/api/resources/companies/types/UpsertUserTraitResponse.java +++ b/src/main/java/com/schematic/api/resources/companies/types/UpsertUserTraitResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertUserTraitResponse.Builder.class) public final class UpsertUserTraitResponse { private final UserDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/components/requests/CountComponentsRequest.java b/src/main/java/com/schematic/api/resources/components/requests/CountComponentsRequest.java index c6e5a0d..c736360 100644 --- a/src/main/java/com/schematic/api/resources/components/requests/CountComponentsRequest.java +++ b/src/main/java/com/schematic/api/resources/components/requests/CountComponentsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountComponentsRequest.Builder.class) public final class CountComponentsRequest { private final Optional q; @@ -116,7 +116,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -127,7 +127,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -138,7 +138,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/components/requests/CreateComponentRequestBody.java b/src/main/java/com/schematic/api/resources/components/requests/CreateComponentRequestBody.java index 34931ba..6f6951b 100644 --- a/src/main/java/com/schematic/api/resources/components/requests/CreateComponentRequestBody.java +++ b/src/main/java/com/schematic/api/resources/components/requests/CreateComponentRequestBody.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateComponentRequestBody.Builder.class) public final class CreateComponentRequestBody { private final Optional> ast; @@ -139,7 +139,7 @@ public _FinalStage name(String name) { @java.lang.Override public _FinalStage ast(Map ast) { - this.ast = Optional.of(ast); + this.ast = Optional.ofNullable(ast); return this; } diff --git a/src/main/java/com/schematic/api/resources/components/requests/ListComponentsRequest.java b/src/main/java/com/schematic/api/resources/components/requests/ListComponentsRequest.java index be13743..ff2ecdd 100644 --- a/src/main/java/com/schematic/api/resources/components/requests/ListComponentsRequest.java +++ b/src/main/java/com/schematic/api/resources/components/requests/ListComponentsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListComponentsRequest.Builder.class) public final class ListComponentsRequest { private final Optional q; @@ -116,7 +116,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -127,7 +127,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -138,7 +138,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/components/requests/PreviewComponentDataRequest.java b/src/main/java/com/schematic/api/resources/components/requests/PreviewComponentDataRequest.java index efe0621..e3aef92 100644 --- a/src/main/java/com/schematic/api/resources/components/requests/PreviewComponentDataRequest.java +++ b/src/main/java/com/schematic/api/resources/components/requests/PreviewComponentDataRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PreviewComponentDataRequest.Builder.class) public final class PreviewComponentDataRequest { private final Optional companyId; @@ -96,7 +96,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -107,7 +107,7 @@ public Builder componentId(Optional componentId) { } public Builder componentId(String componentId) { - this.componentId = Optional.of(componentId); + this.componentId = Optional.ofNullable(componentId); return this; } diff --git a/src/main/java/com/schematic/api/resources/components/requests/UpdateComponentRequestBody.java b/src/main/java/com/schematic/api/resources/components/requests/UpdateComponentRequestBody.java index 7f66c21..0a3f4c1 100644 --- a/src/main/java/com/schematic/api/resources/components/requests/UpdateComponentRequestBody.java +++ b/src/main/java/com/schematic/api/resources/components/requests/UpdateComponentRequestBody.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateComponentRequestBody.Builder.class) public final class UpdateComponentRequestBody { private final Optional> ast; @@ -127,7 +127,7 @@ public Builder ast(Optional> ast) { } public Builder ast(Map ast) { - this.ast = Optional.of(ast); + this.ast = Optional.ofNullable(ast); return this; } @@ -138,7 +138,7 @@ public Builder entityType(Optional entityT } public Builder entityType(UpdateComponentRequestBodyEntityType entityType) { - this.entityType = Optional.of(entityType); + this.entityType = Optional.ofNullable(entityType); return this; } @@ -149,7 +149,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -160,7 +160,7 @@ public Builder state(Optional state) { } public Builder state(UpdateComponentRequestBodyState state) { - this.state = Optional.of(state); + this.state = Optional.ofNullable(state); return this; } diff --git a/src/main/java/com/schematic/api/resources/components/types/CountComponentsParams.java b/src/main/java/com/schematic/api/resources/components/types/CountComponentsParams.java index 8c6e02d..5660c98 100644 --- a/src/main/java/com/schematic/api/resources/components/types/CountComponentsParams.java +++ b/src/main/java/com/schematic/api/resources/components/types/CountComponentsParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountComponentsParams.Builder.class) public final class CountComponentsParams { private final Optional limit; @@ -116,7 +116,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -127,7 +127,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -138,7 +138,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/components/types/CountComponentsResponse.java b/src/main/java/com/schematic/api/resources/components/types/CountComponentsResponse.java index 78be768..2b905dc 100644 --- a/src/main/java/com/schematic/api/resources/components/types/CountComponentsResponse.java +++ b/src/main/java/com/schematic/api/resources/components/types/CountComponentsResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountComponentsResponse.Builder.class) public final class CountComponentsResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/components/types/CreateComponentResponse.java b/src/main/java/com/schematic/api/resources/components/types/CreateComponentResponse.java index b78a9c1..09f6c56 100644 --- a/src/main/java/com/schematic/api/resources/components/types/CreateComponentResponse.java +++ b/src/main/java/com/schematic/api/resources/components/types/CreateComponentResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateComponentResponse.Builder.class) public final class CreateComponentResponse { private final ComponentResponseData data; diff --git a/src/main/java/com/schematic/api/resources/components/types/DeleteComponentResponse.java b/src/main/java/com/schematic/api/resources/components/types/DeleteComponentResponse.java index 94045bf..c697eb2 100644 --- a/src/main/java/com/schematic/api/resources/components/types/DeleteComponentResponse.java +++ b/src/main/java/com/schematic/api/resources/components/types/DeleteComponentResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteComponentResponse.Builder.class) public final class DeleteComponentResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/components/types/GetComponentResponse.java b/src/main/java/com/schematic/api/resources/components/types/GetComponentResponse.java index c170300..6c5ec5e 100644 --- a/src/main/java/com/schematic/api/resources/components/types/GetComponentResponse.java +++ b/src/main/java/com/schematic/api/resources/components/types/GetComponentResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetComponentResponse.Builder.class) public final class GetComponentResponse { private final ComponentResponseData data; diff --git a/src/main/java/com/schematic/api/resources/components/types/ListComponentsParams.java b/src/main/java/com/schematic/api/resources/components/types/ListComponentsParams.java index 16df310..b002f50 100644 --- a/src/main/java/com/schematic/api/resources/components/types/ListComponentsParams.java +++ b/src/main/java/com/schematic/api/resources/components/types/ListComponentsParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListComponentsParams.Builder.class) public final class ListComponentsParams { private final Optional limit; @@ -116,7 +116,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -127,7 +127,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -138,7 +138,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/components/types/ListComponentsResponse.java b/src/main/java/com/schematic/api/resources/components/types/ListComponentsResponse.java index e34e5fc..2d84416 100644 --- a/src/main/java/com/schematic/api/resources/components/types/ListComponentsResponse.java +++ b/src/main/java/com/schematic/api/resources/components/types/ListComponentsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListComponentsResponse.Builder.class) public final class ListComponentsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/components/types/PreviewComponentDataParams.java b/src/main/java/com/schematic/api/resources/components/types/PreviewComponentDataParams.java index 66d06dc..9a7d4b6 100644 --- a/src/main/java/com/schematic/api/resources/components/types/PreviewComponentDataParams.java +++ b/src/main/java/com/schematic/api/resources/components/types/PreviewComponentDataParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PreviewComponentDataParams.Builder.class) public final class PreviewComponentDataParams { private final Optional companyId; @@ -96,7 +96,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -107,7 +107,7 @@ public Builder componentId(Optional componentId) { } public Builder componentId(String componentId) { - this.componentId = Optional.of(componentId); + this.componentId = Optional.ofNullable(componentId); return this; } diff --git a/src/main/java/com/schematic/api/resources/components/types/PreviewComponentDataResponse.java b/src/main/java/com/schematic/api/resources/components/types/PreviewComponentDataResponse.java index aecb630..3a0f78b 100644 --- a/src/main/java/com/schematic/api/resources/components/types/PreviewComponentDataResponse.java +++ b/src/main/java/com/schematic/api/resources/components/types/PreviewComponentDataResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PreviewComponentDataResponse.Builder.class) public final class PreviewComponentDataResponse { private final ComponentPreviewResponseData data; diff --git a/src/main/java/com/schematic/api/resources/components/types/UpdateComponentResponse.java b/src/main/java/com/schematic/api/resources/components/types/UpdateComponentResponse.java index 76a6e70..b1c61f4 100644 --- a/src/main/java/com/schematic/api/resources/components/types/UpdateComponentResponse.java +++ b/src/main/java/com/schematic/api/resources/components/types/UpdateComponentResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateComponentResponse.Builder.class) public final class UpdateComponentResponse { private final ComponentResponseData data; diff --git a/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmDealLineItemAssociationRequestBody.java b/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmDealLineItemAssociationRequestBody.java index 6245c09..6a2d96a 100644 --- a/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmDealLineItemAssociationRequestBody.java +++ b/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmDealLineItemAssociationRequestBody.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateCrmDealLineItemAssociationRequestBody.Builder.class) public final class CreateCrmDealLineItemAssociationRequestBody { private final String dealExternalId; diff --git a/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmDealRequestBody.java b/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmDealRequestBody.java index 0ca7897..ff6f26b 100644 --- a/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmDealRequestBody.java +++ b/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmDealRequestBody.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateCrmDealRequestBody.Builder.class) public final class CreateCrmDealRequestBody { private final Optional arr; @@ -258,7 +258,7 @@ public _FinalStage dealExternalId(String dealExternalId) { @java.lang.Override public _FinalStage mrr(String mrr) { - this.mrr = Optional.of(mrr); + this.mrr = Optional.ofNullable(mrr); return this; } @@ -271,7 +271,7 @@ public _FinalStage mrr(Optional mrr) { @java.lang.Override public _FinalStage dealStage(String dealStage) { - this.dealStage = Optional.of(dealStage); + this.dealStage = Optional.ofNullable(dealStage); return this; } @@ -284,7 +284,7 @@ public _FinalStage dealStage(Optional dealStage) { @java.lang.Override public _FinalStage dealName(String dealName) { - this.dealName = Optional.of(dealName); + this.dealName = Optional.ofNullable(dealName); return this; } @@ -297,7 +297,7 @@ public _FinalStage dealName(Optional dealName) { @java.lang.Override public _FinalStage crmProductId(String crmProductId) { - this.crmProductId = Optional.of(crmProductId); + this.crmProductId = Optional.ofNullable(crmProductId); return this; } @@ -310,7 +310,7 @@ public _FinalStage crmProductId(Optional crmProductId) { @java.lang.Override public _FinalStage crmCompanyId(String crmCompanyId) { - this.crmCompanyId = Optional.of(crmCompanyId); + this.crmCompanyId = Optional.ofNullable(crmCompanyId); return this; } @@ -323,7 +323,7 @@ public _FinalStage crmCompanyId(Optional crmCompanyId) { @java.lang.Override public _FinalStage arr(String arr) { - this.arr = Optional.of(arr); + this.arr = Optional.ofNullable(arr); return this; } diff --git a/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmLineItemRequestBody.java b/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmLineItemRequestBody.java index 25a514d..b8fbc18 100644 --- a/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmLineItemRequestBody.java +++ b/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmLineItemRequestBody.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateCrmLineItemRequestBody.Builder.class) public final class CreateCrmLineItemRequestBody { private final String amount; @@ -260,7 +260,7 @@ public _FinalStage quantity(int quantity) { @java.lang.Override public _FinalStage totalDiscount(String totalDiscount) { - this.totalDiscount = Optional.of(totalDiscount); + this.totalDiscount = Optional.ofNullable(totalDiscount); return this; } @@ -273,7 +273,7 @@ public _FinalStage totalDiscount(Optional totalDiscount) { @java.lang.Override public _FinalStage termMonth(Integer termMonth) { - this.termMonth = Optional.of(termMonth); + this.termMonth = Optional.ofNullable(termMonth); return this; } @@ -286,7 +286,7 @@ public _FinalStage termMonth(Optional termMonth) { @java.lang.Override public _FinalStage discountPercentage(String discountPercentage) { - this.discountPercentage = Optional.of(discountPercentage); + this.discountPercentage = Optional.ofNullable(discountPercentage); return this; } diff --git a/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmProductRequestBody.java b/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmProductRequestBody.java index 93df599..7ca3214 100644 --- a/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmProductRequestBody.java +++ b/src/main/java/com/schematic/api/resources/crm/requests/CreateCrmProductRequestBody.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateCrmProductRequestBody.Builder.class) public final class CreateCrmProductRequestBody { private final String currency; diff --git a/src/main/java/com/schematic/api/resources/crm/requests/ListCrmProductsRequest.java b/src/main/java/com/schematic/api/resources/crm/requests/ListCrmProductsRequest.java index f2df6a8..12370b8 100644 --- a/src/main/java/com/schematic/api/resources/crm/requests/ListCrmProductsRequest.java +++ b/src/main/java/com/schematic/api/resources/crm/requests/ListCrmProductsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCrmProductsRequest.Builder.class) public final class ListCrmProductsRequest { private final Optional ids; @@ -131,7 +131,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -142,7 +142,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -153,7 +153,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -164,7 +164,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/crm/types/ListCrmProductsParams.java b/src/main/java/com/schematic/api/resources/crm/types/ListCrmProductsParams.java index 2b5508b..004e2ed 100644 --- a/src/main/java/com/schematic/api/resources/crm/types/ListCrmProductsParams.java +++ b/src/main/java/com/schematic/api/resources/crm/types/ListCrmProductsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCrmProductsParams.Builder.class) public final class ListCrmProductsParams { private final Optional> ids; @@ -132,7 +132,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -143,7 +143,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -154,7 +154,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -165,7 +165,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/crm/types/ListCrmProductsResponse.java b/src/main/java/com/schematic/api/resources/crm/types/ListCrmProductsResponse.java index 2be9714..fcaebfc 100644 --- a/src/main/java/com/schematic/api/resources/crm/types/ListCrmProductsResponse.java +++ b/src/main/java/com/schematic/api/resources/crm/types/ListCrmProductsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCrmProductsResponse.Builder.class) public final class ListCrmProductsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/crm/types/UpsertCrmDealResponse.java b/src/main/java/com/schematic/api/resources/crm/types/UpsertCrmDealResponse.java index c422706..325b34d 100644 --- a/src/main/java/com/schematic/api/resources/crm/types/UpsertCrmDealResponse.java +++ b/src/main/java/com/schematic/api/resources/crm/types/UpsertCrmDealResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertCrmDealResponse.Builder.class) public final class UpsertCrmDealResponse { private final CrmDealResponseData data; diff --git a/src/main/java/com/schematic/api/resources/crm/types/UpsertCrmProductResponse.java b/src/main/java/com/schematic/api/resources/crm/types/UpsertCrmProductResponse.java index 41f17ef..3f51676 100644 --- a/src/main/java/com/schematic/api/resources/crm/types/UpsertCrmProductResponse.java +++ b/src/main/java/com/schematic/api/resources/crm/types/UpsertCrmProductResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertCrmProductResponse.Builder.class) public final class UpsertCrmProductResponse { private final CrmProductResponseData data; diff --git a/src/main/java/com/schematic/api/resources/crm/types/UpsertDealLineItemAssociationResponse.java b/src/main/java/com/schematic/api/resources/crm/types/UpsertDealLineItemAssociationResponse.java index dc69a6c..f84a0da 100644 --- a/src/main/java/com/schematic/api/resources/crm/types/UpsertDealLineItemAssociationResponse.java +++ b/src/main/java/com/schematic/api/resources/crm/types/UpsertDealLineItemAssociationResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertDealLineItemAssociationResponse.Builder.class) public final class UpsertDealLineItemAssociationResponse { private final CrmLineItemResponseData data; diff --git a/src/main/java/com/schematic/api/resources/crm/types/UpsertLineItemResponse.java b/src/main/java/com/schematic/api/resources/crm/types/UpsertLineItemResponse.java index e0672e0..f4b819a 100644 --- a/src/main/java/com/schematic/api/resources/crm/types/UpsertLineItemResponse.java +++ b/src/main/java/com/schematic/api/resources/crm/types/UpsertLineItemResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertLineItemResponse.Builder.class) public final class UpsertLineItemResponse { private final CrmLineItemResponseData data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/CountCompanyOverridesRequest.java b/src/main/java/com/schematic/api/resources/entitlements/requests/CountCompanyOverridesRequest.java index 91a3500..2801134 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/CountCompanyOverridesRequest.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/CountCompanyOverridesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountCompanyOverridesRequest.Builder.class) public final class CountCompanyOverridesRequest { private final Optional companyId; @@ -30,6 +30,8 @@ public final class CountCompanyOverridesRequest { private final Optional ids; + private final Optional withoutExpired; + private final Optional q; private final Optional limit; @@ -44,6 +46,7 @@ private CountCompanyOverridesRequest( Optional featureId, Optional featureIds, Optional ids, + Optional withoutExpired, Optional q, Optional limit, Optional offset, @@ -53,6 +56,7 @@ private CountCompanyOverridesRequest( this.featureId = featureId; this.featureIds = featureIds; this.ids = ids; + this.withoutExpired = withoutExpired; this.q = q; this.limit = limit; this.offset = offset; @@ -99,6 +103,14 @@ public Optional getIds() { return ids; } + /** + * @return Filter company overrides by whether they have not expired + */ + @JsonProperty("without_expired") + public Optional getWithoutExpired() { + return withoutExpired; + } + /** * @return Search for company overrides by feature or company name */ @@ -140,6 +152,7 @@ private boolean equalTo(CountCompanyOverridesRequest other) { && featureId.equals(other.featureId) && featureIds.equals(other.featureIds) && ids.equals(other.ids) + && withoutExpired.equals(other.withoutExpired) && q.equals(other.q) && limit.equals(other.limit) && offset.equals(other.offset); @@ -153,6 +166,7 @@ public int hashCode() { this.featureId, this.featureIds, this.ids, + this.withoutExpired, this.q, this.limit, this.offset); @@ -179,6 +193,8 @@ public static final class Builder { private Optional ids = Optional.empty(); + private Optional withoutExpired = Optional.empty(); + private Optional q = Optional.empty(); private Optional limit = Optional.empty(); @@ -196,6 +212,7 @@ public Builder from(CountCompanyOverridesRequest other) { featureId(other.getFeatureId()); featureIds(other.getFeatureIds()); ids(other.getIds()); + withoutExpired(other.getWithoutExpired()); q(other.getQ()); limit(other.getLimit()); offset(other.getOffset()); @@ -209,7 +226,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -220,7 +237,7 @@ public Builder companyIds(Optional companyIds) { } public Builder companyIds(String companyIds) { - this.companyIds = Optional.of(companyIds); + this.companyIds = Optional.ofNullable(companyIds); return this; } @@ -231,7 +248,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -242,7 +259,7 @@ public Builder featureIds(Optional featureIds) { } public Builder featureIds(String featureIds) { - this.featureIds = Optional.of(featureIds); + this.featureIds = Optional.ofNullable(featureIds); return this; } @@ -253,7 +270,18 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); + return this; + } + + @JsonSetter(value = "without_expired", nulls = Nulls.SKIP) + public Builder withoutExpired(Optional withoutExpired) { + this.withoutExpired = withoutExpired; + return this; + } + + public Builder withoutExpired(Boolean withoutExpired) { + this.withoutExpired = Optional.ofNullable(withoutExpired); return this; } @@ -264,7 +292,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -275,7 +303,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -286,13 +314,22 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } public CountCompanyOverridesRequest build() { return new CountCompanyOverridesRequest( - companyId, companyIds, featureId, featureIds, ids, q, limit, offset, additionalProperties); + companyId, + companyIds, + featureId, + featureIds, + ids, + withoutExpired, + q, + limit, + offset, + additionalProperties); } } } diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/CountFeatureCompaniesRequest.java b/src/main/java/com/schematic/api/resources/entitlements/requests/CountFeatureCompaniesRequest.java index 315b5d9..bfb7abd 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/CountFeatureCompaniesRequest.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/CountFeatureCompaniesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFeatureCompaniesRequest.Builder.class) public final class CountFeatureCompaniesRequest { private final String featureId; @@ -160,7 +160,7 @@ public _FinalStage featureId(String featureId) { */ @java.lang.Override public _FinalStage offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -177,7 +177,7 @@ public _FinalStage offset(Optional offset) { */ @java.lang.Override public _FinalStage limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -190,7 +190,7 @@ public _FinalStage limit(Optional limit) { @java.lang.Override public _FinalStage q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/CountFeatureUsageRequest.java b/src/main/java/com/schematic/api/resources/entitlements/requests/CountFeatureUsageRequest.java index 7e5895e..8b996ae 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/CountFeatureUsageRequest.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/CountFeatureUsageRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFeatureUsageRequest.Builder.class) public final class CountFeatureUsageRequest { private final Optional companyId; @@ -177,7 +177,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -188,7 +188,7 @@ public Builder companyKeys(Optional> companyKeys) { } public Builder companyKeys(Map companyKeys) { - this.companyKeys = Optional.of(companyKeys); + this.companyKeys = Optional.ofNullable(companyKeys); return this; } @@ -199,7 +199,7 @@ public Builder featureIds(Optional featureIds) { } public Builder featureIds(String featureIds) { - this.featureIds = Optional.of(featureIds); + this.featureIds = Optional.ofNullable(featureIds); return this; } @@ -210,7 +210,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -221,7 +221,7 @@ public Builder withoutNegativeEntitlements(Optional withoutNegativeEnti } public Builder withoutNegativeEntitlements(Boolean withoutNegativeEntitlements) { - this.withoutNegativeEntitlements = Optional.of(withoutNegativeEntitlements); + this.withoutNegativeEntitlements = Optional.ofNullable(withoutNegativeEntitlements); return this; } @@ -232,7 +232,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -243,7 +243,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/CountFeatureUsersRequest.java b/src/main/java/com/schematic/api/resources/entitlements/requests/CountFeatureUsersRequest.java index 7908222..406e984 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/CountFeatureUsersRequest.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/CountFeatureUsersRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFeatureUsersRequest.Builder.class) public final class CountFeatureUsersRequest { private final String featureId; @@ -160,7 +160,7 @@ public _FinalStage featureId(String featureId) { */ @java.lang.Override public _FinalStage offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -177,7 +177,7 @@ public _FinalStage offset(Optional offset) { */ @java.lang.Override public _FinalStage limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -190,7 +190,7 @@ public _FinalStage limit(Optional limit) { @java.lang.Override public _FinalStage q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/CountPlanEntitlementsRequest.java b/src/main/java/com/schematic/api/resources/entitlements/requests/CountPlanEntitlementsRequest.java index 46e1d73..ef3f1d2 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/CountPlanEntitlementsRequest.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/CountPlanEntitlementsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountPlanEntitlementsRequest.Builder.class) public final class CountPlanEntitlementsRequest { private final Optional featureId; @@ -226,7 +226,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -237,7 +237,7 @@ public Builder featureIds(Optional featureIds) { } public Builder featureIds(String featureIds) { - this.featureIds = Optional.of(featureIds); + this.featureIds = Optional.ofNullable(featureIds); return this; } @@ -248,7 +248,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -259,7 +259,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -270,7 +270,7 @@ public Builder planIds(Optional planIds) { } public Builder planIds(String planIds) { - this.planIds = Optional.of(planIds); + this.planIds = Optional.ofNullable(planIds); return this; } @@ -281,7 +281,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -292,7 +292,7 @@ public Builder withMeteredProducts(Optional withMeteredProducts) { } public Builder withMeteredProducts(Boolean withMeteredProducts) { - this.withMeteredProducts = Optional.of(withMeteredProducts); + this.withMeteredProducts = Optional.ofNullable(withMeteredProducts); return this; } @@ -303,7 +303,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -314,7 +314,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/CreateCompanyOverrideRequestBody.java b/src/main/java/com/schematic/api/resources/entitlements/requests/CreateCompanyOverrideRequestBody.java index 69a478e..6db3bb6 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/CreateCompanyOverrideRequestBody.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/CreateCompanyOverrideRequestBody.java @@ -21,7 +21,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateCompanyOverrideRequestBody.Builder.class) public final class CreateCompanyOverrideRequestBody { private final String companyId; @@ -30,10 +30,6 @@ public final class CreateCompanyOverrideRequestBody { private final String featureId; - private final Optional meteredMonthlyPriceId; - - private final Optional meteredYearlyPriceId; - private final Optional metricPeriod; private final Optional metricPeriodMonthReset; @@ -52,8 +48,6 @@ private CreateCompanyOverrideRequestBody( String companyId, Optional expirationDate, String featureId, - Optional meteredMonthlyPriceId, - Optional meteredYearlyPriceId, Optional metricPeriod, Optional metricPeriodMonthReset, Optional valueBool, @@ -64,8 +58,6 @@ private CreateCompanyOverrideRequestBody( this.companyId = companyId; this.expirationDate = expirationDate; this.featureId = featureId; - this.meteredMonthlyPriceId = meteredMonthlyPriceId; - this.meteredYearlyPriceId = meteredYearlyPriceId; this.metricPeriod = metricPeriod; this.metricPeriodMonthReset = metricPeriodMonthReset; this.valueBool = valueBool; @@ -90,16 +82,6 @@ public String getFeatureId() { return featureId; } - @JsonProperty("metered_monthly_price_id") - public Optional getMeteredMonthlyPriceId() { - return meteredMonthlyPriceId; - } - - @JsonProperty("metered_yearly_price_id") - public Optional getMeteredYearlyPriceId() { - return meteredYearlyPriceId; - } - @JsonProperty("metric_period") public Optional getMetricPeriod() { return metricPeriod; @@ -145,8 +127,6 @@ private boolean equalTo(CreateCompanyOverrideRequestBody other) { return companyId.equals(other.companyId) && expirationDate.equals(other.expirationDate) && featureId.equals(other.featureId) - && meteredMonthlyPriceId.equals(other.meteredMonthlyPriceId) - && meteredYearlyPriceId.equals(other.meteredYearlyPriceId) && metricPeriod.equals(other.metricPeriod) && metricPeriodMonthReset.equals(other.metricPeriodMonthReset) && valueBool.equals(other.valueBool) @@ -161,8 +141,6 @@ public int hashCode() { this.companyId, this.expirationDate, this.featureId, - this.meteredMonthlyPriceId, - this.meteredYearlyPriceId, this.metricPeriod, this.metricPeriodMonthReset, this.valueBool, @@ -201,14 +179,6 @@ public interface _FinalStage { _FinalStage expirationDate(OffsetDateTime expirationDate); - _FinalStage meteredMonthlyPriceId(Optional meteredMonthlyPriceId); - - _FinalStage meteredMonthlyPriceId(String meteredMonthlyPriceId); - - _FinalStage meteredYearlyPriceId(Optional meteredYearlyPriceId); - - _FinalStage meteredYearlyPriceId(String meteredYearlyPriceId); - _FinalStage metricPeriod(Optional metricPeriod); _FinalStage metricPeriod(CreateCompanyOverrideRequestBodyMetricPeriod metricPeriod); @@ -251,10 +221,6 @@ public static final class Builder implements CompanyIdStage, FeatureIdStage, Val private Optional metricPeriod = Optional.empty(); - private Optional meteredYearlyPriceId = Optional.empty(); - - private Optional meteredMonthlyPriceId = Optional.empty(); - private Optional expirationDate = Optional.empty(); @JsonAnySetter @@ -267,8 +233,6 @@ public Builder from(CreateCompanyOverrideRequestBody other) { companyId(other.getCompanyId()); expirationDate(other.getExpirationDate()); featureId(other.getFeatureId()); - meteredMonthlyPriceId(other.getMeteredMonthlyPriceId()); - meteredYearlyPriceId(other.getMeteredYearlyPriceId()); metricPeriod(other.getMetricPeriod()); metricPeriodMonthReset(other.getMetricPeriodMonthReset()); valueBool(other.getValueBool()); @@ -301,7 +265,7 @@ public _FinalStage valueType(CreateCompanyOverrideRequestBodyValueType valueType @java.lang.Override public _FinalStage valueTraitId(String valueTraitId) { - this.valueTraitId = Optional.of(valueTraitId); + this.valueTraitId = Optional.ofNullable(valueTraitId); return this; } @@ -314,7 +278,7 @@ public _FinalStage valueTraitId(Optional valueTraitId) { @java.lang.Override public _FinalStage valueNumeric(Integer valueNumeric) { - this.valueNumeric = Optional.of(valueNumeric); + this.valueNumeric = Optional.ofNullable(valueNumeric); return this; } @@ -327,7 +291,7 @@ public _FinalStage valueNumeric(Optional valueNumeric) { @java.lang.Override public _FinalStage valueBool(Boolean valueBool) { - this.valueBool = Optional.of(valueBool); + this.valueBool = Optional.ofNullable(valueBool); return this; } @@ -341,7 +305,7 @@ public _FinalStage valueBool(Optional valueBool) { @java.lang.Override public _FinalStage metricPeriodMonthReset( CreateCompanyOverrideRequestBodyMetricPeriodMonthReset metricPeriodMonthReset) { - this.metricPeriodMonthReset = Optional.of(metricPeriodMonthReset); + this.metricPeriodMonthReset = Optional.ofNullable(metricPeriodMonthReset); return this; } @@ -355,7 +319,7 @@ public _FinalStage metricPeriodMonthReset( @java.lang.Override public _FinalStage metricPeriod(CreateCompanyOverrideRequestBodyMetricPeriod metricPeriod) { - this.metricPeriod = Optional.of(metricPeriod); + this.metricPeriod = Optional.ofNullable(metricPeriod); return this; } @@ -366,35 +330,9 @@ public _FinalStage metricPeriod(Optional meteredYearlyPriceId) { - this.meteredYearlyPriceId = meteredYearlyPriceId; - return this; - } - - @java.lang.Override - public _FinalStage meteredMonthlyPriceId(String meteredMonthlyPriceId) { - this.meteredMonthlyPriceId = Optional.of(meteredMonthlyPriceId); - return this; - } - - @java.lang.Override - @JsonSetter(value = "metered_monthly_price_id", nulls = Nulls.SKIP) - public _FinalStage meteredMonthlyPriceId(Optional meteredMonthlyPriceId) { - this.meteredMonthlyPriceId = meteredMonthlyPriceId; - return this; - } - @java.lang.Override public _FinalStage expirationDate(OffsetDateTime expirationDate) { - this.expirationDate = Optional.of(expirationDate); + this.expirationDate = Optional.ofNullable(expirationDate); return this; } @@ -411,8 +349,6 @@ public CreateCompanyOverrideRequestBody build() { companyId, expirationDate, featureId, - meteredMonthlyPriceId, - meteredYearlyPriceId, metricPeriod, metricPeriodMonthReset, valueBool, diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/CreatePlanEntitlementRequestBody.java b/src/main/java/com/schematic/api/resources/entitlements/requests/CreatePlanEntitlementRequestBody.java index ef101ca..e21d485 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/CreatePlanEntitlementRequestBody.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/CreatePlanEntitlementRequestBody.java @@ -20,15 +20,11 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreatePlanEntitlementRequestBody.Builder.class) public final class CreatePlanEntitlementRequestBody { private final String featureId; - private final Optional meteredMonthlyPriceId; - - private final Optional meteredYearlyPriceId; - private final Optional metricPeriod; private final Optional metricPeriodMonthReset; @@ -53,8 +49,6 @@ public final class CreatePlanEntitlementRequestBody { private CreatePlanEntitlementRequestBody( String featureId, - Optional meteredMonthlyPriceId, - Optional meteredYearlyPriceId, Optional metricPeriod, Optional metricPeriodMonthReset, Optional monthlyMeteredPriceId, @@ -67,8 +61,6 @@ private CreatePlanEntitlementRequestBody( Optional yearlyMeteredPriceId, Map additionalProperties) { this.featureId = featureId; - this.meteredMonthlyPriceId = meteredMonthlyPriceId; - this.meteredYearlyPriceId = meteredYearlyPriceId; this.metricPeriod = metricPeriod; this.metricPeriodMonthReset = metricPeriodMonthReset; this.monthlyMeteredPriceId = monthlyMeteredPriceId; @@ -87,16 +79,6 @@ public String getFeatureId() { return featureId; } - @JsonProperty("metered_monthly_price_id") - public Optional getMeteredMonthlyPriceId() { - return meteredMonthlyPriceId; - } - - @JsonProperty("metered_yearly_price_id") - public Optional getMeteredYearlyPriceId() { - return meteredYearlyPriceId; - } - @JsonProperty("metric_period") public Optional getMetricPeriod() { return metricPeriod; @@ -160,8 +142,6 @@ public Map getAdditionalProperties() { private boolean equalTo(CreatePlanEntitlementRequestBody other) { return featureId.equals(other.featureId) - && meteredMonthlyPriceId.equals(other.meteredMonthlyPriceId) - && meteredYearlyPriceId.equals(other.meteredYearlyPriceId) && metricPeriod.equals(other.metricPeriod) && metricPeriodMonthReset.equals(other.metricPeriodMonthReset) && monthlyMeteredPriceId.equals(other.monthlyMeteredPriceId) @@ -178,8 +158,6 @@ private boolean equalTo(CreatePlanEntitlementRequestBody other) { public int hashCode() { return Objects.hash( this.featureId, - this.meteredMonthlyPriceId, - this.meteredYearlyPriceId, this.metricPeriod, this.metricPeriodMonthReset, this.monthlyMeteredPriceId, @@ -218,14 +196,6 @@ public interface ValueTypeStage { public interface _FinalStage { CreatePlanEntitlementRequestBody build(); - _FinalStage meteredMonthlyPriceId(Optional meteredMonthlyPriceId); - - _FinalStage meteredMonthlyPriceId(String meteredMonthlyPriceId); - - _FinalStage meteredYearlyPriceId(Optional meteredYearlyPriceId); - - _FinalStage meteredYearlyPriceId(String meteredYearlyPriceId); - _FinalStage metricPeriod(Optional metricPeriod); _FinalStage metricPeriod(CreatePlanEntitlementRequestBodyMetricPeriod metricPeriod); @@ -286,10 +256,6 @@ public static final class Builder implements FeatureIdStage, PlanIdStage, ValueT private Optional metricPeriod = Optional.empty(); - private Optional meteredYearlyPriceId = Optional.empty(); - - private Optional meteredMonthlyPriceId = Optional.empty(); - @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -298,8 +264,6 @@ private Builder() {} @java.lang.Override public Builder from(CreatePlanEntitlementRequestBody other) { featureId(other.getFeatureId()); - meteredMonthlyPriceId(other.getMeteredMonthlyPriceId()); - meteredYearlyPriceId(other.getMeteredYearlyPriceId()); metricPeriod(other.getMetricPeriod()); metricPeriodMonthReset(other.getMetricPeriodMonthReset()); monthlyMeteredPriceId(other.getMonthlyMeteredPriceId()); @@ -336,7 +300,7 @@ public _FinalStage valueType(CreatePlanEntitlementRequestBodyValueType valueType @java.lang.Override public _FinalStage yearlyMeteredPriceId(String yearlyMeteredPriceId) { - this.yearlyMeteredPriceId = Optional.of(yearlyMeteredPriceId); + this.yearlyMeteredPriceId = Optional.ofNullable(yearlyMeteredPriceId); return this; } @@ -349,7 +313,7 @@ public _FinalStage yearlyMeteredPriceId(Optional yearlyMeteredPriceId) { @java.lang.Override public _FinalStage valueTraitId(String valueTraitId) { - this.valueTraitId = Optional.of(valueTraitId); + this.valueTraitId = Optional.ofNullable(valueTraitId); return this; } @@ -362,7 +326,7 @@ public _FinalStage valueTraitId(Optional valueTraitId) { @java.lang.Override public _FinalStage valueNumeric(Integer valueNumeric) { - this.valueNumeric = Optional.of(valueNumeric); + this.valueNumeric = Optional.ofNullable(valueNumeric); return this; } @@ -375,7 +339,7 @@ public _FinalStage valueNumeric(Optional valueNumeric) { @java.lang.Override public _FinalStage valueBool(Boolean valueBool) { - this.valueBool = Optional.of(valueBool); + this.valueBool = Optional.ofNullable(valueBool); return this; } @@ -388,7 +352,7 @@ public _FinalStage valueBool(Optional valueBool) { @java.lang.Override public _FinalStage priceBehavior(String priceBehavior) { - this.priceBehavior = Optional.of(priceBehavior); + this.priceBehavior = Optional.ofNullable(priceBehavior); return this; } @@ -401,7 +365,7 @@ public _FinalStage priceBehavior(Optional priceBehavior) { @java.lang.Override public _FinalStage monthlyMeteredPriceId(String monthlyMeteredPriceId) { - this.monthlyMeteredPriceId = Optional.of(monthlyMeteredPriceId); + this.monthlyMeteredPriceId = Optional.ofNullable(monthlyMeteredPriceId); return this; } @@ -415,7 +379,7 @@ public _FinalStage monthlyMeteredPriceId(Optional monthlyMeteredPriceId) @java.lang.Override public _FinalStage metricPeriodMonthReset( CreatePlanEntitlementRequestBodyMetricPeriodMonthReset metricPeriodMonthReset) { - this.metricPeriodMonthReset = Optional.of(metricPeriodMonthReset); + this.metricPeriodMonthReset = Optional.ofNullable(metricPeriodMonthReset); return this; } @@ -429,7 +393,7 @@ public _FinalStage metricPeriodMonthReset( @java.lang.Override public _FinalStage metricPeriod(CreatePlanEntitlementRequestBodyMetricPeriod metricPeriod) { - this.metricPeriod = Optional.of(metricPeriod); + this.metricPeriod = Optional.ofNullable(metricPeriod); return this; } @@ -440,38 +404,10 @@ public _FinalStage metricPeriod(Optional meteredYearlyPriceId) { - this.meteredYearlyPriceId = meteredYearlyPriceId; - return this; - } - - @java.lang.Override - public _FinalStage meteredMonthlyPriceId(String meteredMonthlyPriceId) { - this.meteredMonthlyPriceId = Optional.of(meteredMonthlyPriceId); - return this; - } - - @java.lang.Override - @JsonSetter(value = "metered_monthly_price_id", nulls = Nulls.SKIP) - public _FinalStage meteredMonthlyPriceId(Optional meteredMonthlyPriceId) { - this.meteredMonthlyPriceId = meteredMonthlyPriceId; - return this; - } - @java.lang.Override public CreatePlanEntitlementRequestBody build() { return new CreatePlanEntitlementRequestBody( featureId, - meteredMonthlyPriceId, - meteredYearlyPriceId, metricPeriod, metricPeriodMonthReset, monthlyMeteredPriceId, diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/GetFeatureUsageByCompanyRequest.java b/src/main/java/com/schematic/api/resources/entitlements/requests/GetFeatureUsageByCompanyRequest.java index 683faa7..89182d0 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/GetFeatureUsageByCompanyRequest.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/GetFeatureUsageByCompanyRequest.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetFeatureUsageByCompanyRequest.Builder.class) public final class GetFeatureUsageByCompanyRequest { private final Map keys; diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/ListCompanyOverridesRequest.java b/src/main/java/com/schematic/api/resources/entitlements/requests/ListCompanyOverridesRequest.java index 7f7e091..c5eb20d 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/ListCompanyOverridesRequest.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/ListCompanyOverridesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCompanyOverridesRequest.Builder.class) public final class ListCompanyOverridesRequest { private final Optional companyId; @@ -30,6 +30,8 @@ public final class ListCompanyOverridesRequest { private final Optional ids; + private final Optional withoutExpired; + private final Optional q; private final Optional limit; @@ -44,6 +46,7 @@ private ListCompanyOverridesRequest( Optional featureId, Optional featureIds, Optional ids, + Optional withoutExpired, Optional q, Optional limit, Optional offset, @@ -53,6 +56,7 @@ private ListCompanyOverridesRequest( this.featureId = featureId; this.featureIds = featureIds; this.ids = ids; + this.withoutExpired = withoutExpired; this.q = q; this.limit = limit; this.offset = offset; @@ -99,6 +103,14 @@ public Optional getIds() { return ids; } + /** + * @return Filter company overrides by whether they have not expired + */ + @JsonProperty("without_expired") + public Optional getWithoutExpired() { + return withoutExpired; + } + /** * @return Search for company overrides by feature or company name */ @@ -140,6 +152,7 @@ private boolean equalTo(ListCompanyOverridesRequest other) { && featureId.equals(other.featureId) && featureIds.equals(other.featureIds) && ids.equals(other.ids) + && withoutExpired.equals(other.withoutExpired) && q.equals(other.q) && limit.equals(other.limit) && offset.equals(other.offset); @@ -153,6 +166,7 @@ public int hashCode() { this.featureId, this.featureIds, this.ids, + this.withoutExpired, this.q, this.limit, this.offset); @@ -179,6 +193,8 @@ public static final class Builder { private Optional ids = Optional.empty(); + private Optional withoutExpired = Optional.empty(); + private Optional q = Optional.empty(); private Optional limit = Optional.empty(); @@ -196,6 +212,7 @@ public Builder from(ListCompanyOverridesRequest other) { featureId(other.getFeatureId()); featureIds(other.getFeatureIds()); ids(other.getIds()); + withoutExpired(other.getWithoutExpired()); q(other.getQ()); limit(other.getLimit()); offset(other.getOffset()); @@ -209,7 +226,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -220,7 +237,7 @@ public Builder companyIds(Optional companyIds) { } public Builder companyIds(String companyIds) { - this.companyIds = Optional.of(companyIds); + this.companyIds = Optional.ofNullable(companyIds); return this; } @@ -231,7 +248,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -242,7 +259,7 @@ public Builder featureIds(Optional featureIds) { } public Builder featureIds(String featureIds) { - this.featureIds = Optional.of(featureIds); + this.featureIds = Optional.ofNullable(featureIds); return this; } @@ -253,7 +270,18 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); + return this; + } + + @JsonSetter(value = "without_expired", nulls = Nulls.SKIP) + public Builder withoutExpired(Optional withoutExpired) { + this.withoutExpired = withoutExpired; + return this; + } + + public Builder withoutExpired(Boolean withoutExpired) { + this.withoutExpired = Optional.ofNullable(withoutExpired); return this; } @@ -264,7 +292,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -275,7 +303,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -286,13 +314,22 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } public ListCompanyOverridesRequest build() { return new ListCompanyOverridesRequest( - companyId, companyIds, featureId, featureIds, ids, q, limit, offset, additionalProperties); + companyId, + companyIds, + featureId, + featureIds, + ids, + withoutExpired, + q, + limit, + offset, + additionalProperties); } } } diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/ListFeatureCompaniesRequest.java b/src/main/java/com/schematic/api/resources/entitlements/requests/ListFeatureCompaniesRequest.java index baf7f3c..7252e4b 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/ListFeatureCompaniesRequest.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/ListFeatureCompaniesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFeatureCompaniesRequest.Builder.class) public final class ListFeatureCompaniesRequest { private final String featureId; @@ -160,7 +160,7 @@ public _FinalStage featureId(String featureId) { */ @java.lang.Override public _FinalStage offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -177,7 +177,7 @@ public _FinalStage offset(Optional offset) { */ @java.lang.Override public _FinalStage limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -190,7 +190,7 @@ public _FinalStage limit(Optional limit) { @java.lang.Override public _FinalStage q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/ListFeatureUsageRequest.java b/src/main/java/com/schematic/api/resources/entitlements/requests/ListFeatureUsageRequest.java index c6ffbd6..91ed5f4 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/ListFeatureUsageRequest.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/ListFeatureUsageRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFeatureUsageRequest.Builder.class) public final class ListFeatureUsageRequest { private final Optional companyId; @@ -177,7 +177,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -188,7 +188,7 @@ public Builder companyKeys(Optional> companyKeys) { } public Builder companyKeys(Map companyKeys) { - this.companyKeys = Optional.of(companyKeys); + this.companyKeys = Optional.ofNullable(companyKeys); return this; } @@ -199,7 +199,7 @@ public Builder featureIds(Optional featureIds) { } public Builder featureIds(String featureIds) { - this.featureIds = Optional.of(featureIds); + this.featureIds = Optional.ofNullable(featureIds); return this; } @@ -210,7 +210,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -221,7 +221,7 @@ public Builder withoutNegativeEntitlements(Optional withoutNegativeEnti } public Builder withoutNegativeEntitlements(Boolean withoutNegativeEntitlements) { - this.withoutNegativeEntitlements = Optional.of(withoutNegativeEntitlements); + this.withoutNegativeEntitlements = Optional.ofNullable(withoutNegativeEntitlements); return this; } @@ -232,7 +232,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -243,7 +243,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/ListFeatureUsersRequest.java b/src/main/java/com/schematic/api/resources/entitlements/requests/ListFeatureUsersRequest.java index 0d8ced7..f73757f 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/ListFeatureUsersRequest.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/ListFeatureUsersRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFeatureUsersRequest.Builder.class) public final class ListFeatureUsersRequest { private final String featureId; @@ -160,7 +160,7 @@ public _FinalStage featureId(String featureId) { */ @java.lang.Override public _FinalStage offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -177,7 +177,7 @@ public _FinalStage offset(Optional offset) { */ @java.lang.Override public _FinalStage limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -190,7 +190,7 @@ public _FinalStage limit(Optional limit) { @java.lang.Override public _FinalStage q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/ListPlanEntitlementsRequest.java b/src/main/java/com/schematic/api/resources/entitlements/requests/ListPlanEntitlementsRequest.java index 6e69640..903ac58 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/ListPlanEntitlementsRequest.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/ListPlanEntitlementsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListPlanEntitlementsRequest.Builder.class) public final class ListPlanEntitlementsRequest { private final Optional featureId; @@ -226,7 +226,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -237,7 +237,7 @@ public Builder featureIds(Optional featureIds) { } public Builder featureIds(String featureIds) { - this.featureIds = Optional.of(featureIds); + this.featureIds = Optional.ofNullable(featureIds); return this; } @@ -248,7 +248,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -259,7 +259,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -270,7 +270,7 @@ public Builder planIds(Optional planIds) { } public Builder planIds(String planIds) { - this.planIds = Optional.of(planIds); + this.planIds = Optional.ofNullable(planIds); return this; } @@ -281,7 +281,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -292,7 +292,7 @@ public Builder withMeteredProducts(Optional withMeteredProducts) { } public Builder withMeteredProducts(Boolean withMeteredProducts) { - this.withMeteredProducts = Optional.of(withMeteredProducts); + this.withMeteredProducts = Optional.ofNullable(withMeteredProducts); return this; } @@ -303,7 +303,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -314,7 +314,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/UpdateCompanyOverrideRequestBody.java b/src/main/java/com/schematic/api/resources/entitlements/requests/UpdateCompanyOverrideRequestBody.java index e96f8e6..effd2a1 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/UpdateCompanyOverrideRequestBody.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/UpdateCompanyOverrideRequestBody.java @@ -21,15 +21,11 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateCompanyOverrideRequestBody.Builder.class) public final class UpdateCompanyOverrideRequestBody { private final Optional expirationDate; - private final Optional meteredMonthlyPriceId; - - private final Optional meteredYearlyPriceId; - private final Optional metricPeriod; private final Optional metricPeriodMonthReset; @@ -46,8 +42,6 @@ public final class UpdateCompanyOverrideRequestBody { private UpdateCompanyOverrideRequestBody( Optional expirationDate, - Optional meteredMonthlyPriceId, - Optional meteredYearlyPriceId, Optional metricPeriod, Optional metricPeriodMonthReset, Optional valueBool, @@ -56,8 +50,6 @@ private UpdateCompanyOverrideRequestBody( UpdateCompanyOverrideRequestBodyValueType valueType, Map additionalProperties) { this.expirationDate = expirationDate; - this.meteredMonthlyPriceId = meteredMonthlyPriceId; - this.meteredYearlyPriceId = meteredYearlyPriceId; this.metricPeriod = metricPeriod; this.metricPeriodMonthReset = metricPeriodMonthReset; this.valueBool = valueBool; @@ -72,16 +64,6 @@ public Optional getExpirationDate() { return expirationDate; } - @JsonProperty("metered_monthly_price_id") - public Optional getMeteredMonthlyPriceId() { - return meteredMonthlyPriceId; - } - - @JsonProperty("metered_yearly_price_id") - public Optional getMeteredYearlyPriceId() { - return meteredYearlyPriceId; - } - @JsonProperty("metric_period") public Optional getMetricPeriod() { return metricPeriod; @@ -125,8 +107,6 @@ public Map getAdditionalProperties() { private boolean equalTo(UpdateCompanyOverrideRequestBody other) { return expirationDate.equals(other.expirationDate) - && meteredMonthlyPriceId.equals(other.meteredMonthlyPriceId) - && meteredYearlyPriceId.equals(other.meteredYearlyPriceId) && metricPeriod.equals(other.metricPeriod) && metricPeriodMonthReset.equals(other.metricPeriodMonthReset) && valueBool.equals(other.valueBool) @@ -139,8 +119,6 @@ private boolean equalTo(UpdateCompanyOverrideRequestBody other) { public int hashCode() { return Objects.hash( this.expirationDate, - this.meteredMonthlyPriceId, - this.meteredYearlyPriceId, this.metricPeriod, this.metricPeriodMonthReset, this.valueBool, @@ -171,14 +149,6 @@ public interface _FinalStage { _FinalStage expirationDate(OffsetDateTime expirationDate); - _FinalStage meteredMonthlyPriceId(Optional meteredMonthlyPriceId); - - _FinalStage meteredMonthlyPriceId(String meteredMonthlyPriceId); - - _FinalStage meteredYearlyPriceId(Optional meteredYearlyPriceId); - - _FinalStage meteredYearlyPriceId(String meteredYearlyPriceId); - _FinalStage metricPeriod(Optional metricPeriod); _FinalStage metricPeriod(UpdateCompanyOverrideRequestBodyMetricPeriod metricPeriod); @@ -217,10 +187,6 @@ public static final class Builder implements ValueTypeStage, _FinalStage { private Optional metricPeriod = Optional.empty(); - private Optional meteredYearlyPriceId = Optional.empty(); - - private Optional meteredMonthlyPriceId = Optional.empty(); - private Optional expirationDate = Optional.empty(); @JsonAnySetter @@ -231,8 +197,6 @@ private Builder() {} @java.lang.Override public Builder from(UpdateCompanyOverrideRequestBody other) { expirationDate(other.getExpirationDate()); - meteredMonthlyPriceId(other.getMeteredMonthlyPriceId()); - meteredYearlyPriceId(other.getMeteredYearlyPriceId()); metricPeriod(other.getMetricPeriod()); metricPeriodMonthReset(other.getMetricPeriodMonthReset()); valueBool(other.getValueBool()); @@ -251,7 +215,7 @@ public _FinalStage valueType(UpdateCompanyOverrideRequestBodyValueType valueType @java.lang.Override public _FinalStage valueTraitId(String valueTraitId) { - this.valueTraitId = Optional.of(valueTraitId); + this.valueTraitId = Optional.ofNullable(valueTraitId); return this; } @@ -264,7 +228,7 @@ public _FinalStage valueTraitId(Optional valueTraitId) { @java.lang.Override public _FinalStage valueNumeric(Integer valueNumeric) { - this.valueNumeric = Optional.of(valueNumeric); + this.valueNumeric = Optional.ofNullable(valueNumeric); return this; } @@ -277,7 +241,7 @@ public _FinalStage valueNumeric(Optional valueNumeric) { @java.lang.Override public _FinalStage valueBool(Boolean valueBool) { - this.valueBool = Optional.of(valueBool); + this.valueBool = Optional.ofNullable(valueBool); return this; } @@ -291,7 +255,7 @@ public _FinalStage valueBool(Optional valueBool) { @java.lang.Override public _FinalStage metricPeriodMonthReset( UpdateCompanyOverrideRequestBodyMetricPeriodMonthReset metricPeriodMonthReset) { - this.metricPeriodMonthReset = Optional.of(metricPeriodMonthReset); + this.metricPeriodMonthReset = Optional.ofNullable(metricPeriodMonthReset); return this; } @@ -305,7 +269,7 @@ public _FinalStage metricPeriodMonthReset( @java.lang.Override public _FinalStage metricPeriod(UpdateCompanyOverrideRequestBodyMetricPeriod metricPeriod) { - this.metricPeriod = Optional.of(metricPeriod); + this.metricPeriod = Optional.ofNullable(metricPeriod); return this; } @@ -316,35 +280,9 @@ public _FinalStage metricPeriod(Optional meteredYearlyPriceId) { - this.meteredYearlyPriceId = meteredYearlyPriceId; - return this; - } - - @java.lang.Override - public _FinalStage meteredMonthlyPriceId(String meteredMonthlyPriceId) { - this.meteredMonthlyPriceId = Optional.of(meteredMonthlyPriceId); - return this; - } - - @java.lang.Override - @JsonSetter(value = "metered_monthly_price_id", nulls = Nulls.SKIP) - public _FinalStage meteredMonthlyPriceId(Optional meteredMonthlyPriceId) { - this.meteredMonthlyPriceId = meteredMonthlyPriceId; - return this; - } - @java.lang.Override public _FinalStage expirationDate(OffsetDateTime expirationDate) { - this.expirationDate = Optional.of(expirationDate); + this.expirationDate = Optional.ofNullable(expirationDate); return this; } @@ -359,8 +297,6 @@ public _FinalStage expirationDate(Optional expirationDate) { public UpdateCompanyOverrideRequestBody build() { return new UpdateCompanyOverrideRequestBody( expirationDate, - meteredMonthlyPriceId, - meteredYearlyPriceId, metricPeriod, metricPeriodMonthReset, valueBool, diff --git a/src/main/java/com/schematic/api/resources/entitlements/requests/UpdatePlanEntitlementRequestBody.java b/src/main/java/com/schematic/api/resources/entitlements/requests/UpdatePlanEntitlementRequestBody.java index 8cdd748..78ea4c8 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/requests/UpdatePlanEntitlementRequestBody.java +++ b/src/main/java/com/schematic/api/resources/entitlements/requests/UpdatePlanEntitlementRequestBody.java @@ -20,17 +20,17 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdatePlanEntitlementRequestBody.Builder.class) public final class UpdatePlanEntitlementRequestBody { - private final Optional meteredMonthlyPriceId; - - private final Optional meteredYearlyPriceId; - private final Optional metricPeriod; private final Optional metricPeriodMonthReset; + private final Optional monthlyMeteredPriceId; + + private final Optional priceBehavior; + private final Optional valueBool; private final Optional valueNumeric; @@ -39,39 +39,33 @@ public final class UpdatePlanEntitlementRequestBody { private final UpdatePlanEntitlementRequestBodyValueType valueType; + private final Optional yearlyMeteredPriceId; + private final Map additionalProperties; private UpdatePlanEntitlementRequestBody( - Optional meteredMonthlyPriceId, - Optional meteredYearlyPriceId, Optional metricPeriod, Optional metricPeriodMonthReset, + Optional monthlyMeteredPriceId, + Optional priceBehavior, Optional valueBool, Optional valueNumeric, Optional valueTraitId, UpdatePlanEntitlementRequestBodyValueType valueType, + Optional yearlyMeteredPriceId, Map additionalProperties) { - this.meteredMonthlyPriceId = meteredMonthlyPriceId; - this.meteredYearlyPriceId = meteredYearlyPriceId; this.metricPeriod = metricPeriod; this.metricPeriodMonthReset = metricPeriodMonthReset; + this.monthlyMeteredPriceId = monthlyMeteredPriceId; + this.priceBehavior = priceBehavior; this.valueBool = valueBool; this.valueNumeric = valueNumeric; this.valueTraitId = valueTraitId; this.valueType = valueType; + this.yearlyMeteredPriceId = yearlyMeteredPriceId; this.additionalProperties = additionalProperties; } - @JsonProperty("metered_monthly_price_id") - public Optional getMeteredMonthlyPriceId() { - return meteredMonthlyPriceId; - } - - @JsonProperty("metered_yearly_price_id") - public Optional getMeteredYearlyPriceId() { - return meteredYearlyPriceId; - } - @JsonProperty("metric_period") public Optional getMetricPeriod() { return metricPeriod; @@ -82,6 +76,16 @@ public Optional getMetri return metricPeriodMonthReset; } + @JsonProperty("monthly_metered_price_id") + public Optional getMonthlyMeteredPriceId() { + return monthlyMeteredPriceId; + } + + @JsonProperty("price_behavior") + public Optional getPriceBehavior() { + return priceBehavior; + } + @JsonProperty("value_bool") public Optional getValueBool() { return valueBool; @@ -102,6 +106,11 @@ public UpdatePlanEntitlementRequestBodyValueType getValueType() { return valueType; } + @JsonProperty("yearly_metered_price_id") + public Optional getYearlyMeteredPriceId() { + return yearlyMeteredPriceId; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -114,27 +123,29 @@ public Map getAdditionalProperties() { } private boolean equalTo(UpdatePlanEntitlementRequestBody other) { - return meteredMonthlyPriceId.equals(other.meteredMonthlyPriceId) - && meteredYearlyPriceId.equals(other.meteredYearlyPriceId) - && metricPeriod.equals(other.metricPeriod) + return metricPeriod.equals(other.metricPeriod) && metricPeriodMonthReset.equals(other.metricPeriodMonthReset) + && monthlyMeteredPriceId.equals(other.monthlyMeteredPriceId) + && priceBehavior.equals(other.priceBehavior) && valueBool.equals(other.valueBool) && valueNumeric.equals(other.valueNumeric) && valueTraitId.equals(other.valueTraitId) - && valueType.equals(other.valueType); + && valueType.equals(other.valueType) + && yearlyMeteredPriceId.equals(other.yearlyMeteredPriceId); } @java.lang.Override public int hashCode() { return Objects.hash( - this.meteredMonthlyPriceId, - this.meteredYearlyPriceId, this.metricPeriod, this.metricPeriodMonthReset, + this.monthlyMeteredPriceId, + this.priceBehavior, this.valueBool, this.valueNumeric, this.valueTraitId, - this.valueType); + this.valueType, + this.yearlyMeteredPriceId); } @java.lang.Override @@ -155,14 +166,6 @@ public interface ValueTypeStage { public interface _FinalStage { UpdatePlanEntitlementRequestBody build(); - _FinalStage meteredMonthlyPriceId(Optional meteredMonthlyPriceId); - - _FinalStage meteredMonthlyPriceId(String meteredMonthlyPriceId); - - _FinalStage meteredYearlyPriceId(Optional meteredYearlyPriceId); - - _FinalStage meteredYearlyPriceId(String meteredYearlyPriceId); - _FinalStage metricPeriod(Optional metricPeriod); _FinalStage metricPeriod(UpdatePlanEntitlementRequestBodyMetricPeriod metricPeriod); @@ -173,6 +176,14 @@ _FinalStage metricPeriodMonthReset( _FinalStage metricPeriodMonthReset( UpdatePlanEntitlementRequestBodyMetricPeriodMonthReset metricPeriodMonthReset); + _FinalStage monthlyMeteredPriceId(Optional monthlyMeteredPriceId); + + _FinalStage monthlyMeteredPriceId(String monthlyMeteredPriceId); + + _FinalStage priceBehavior(Optional priceBehavior); + + _FinalStage priceBehavior(String priceBehavior); + _FinalStage valueBool(Optional valueBool); _FinalStage valueBool(Boolean valueBool); @@ -184,27 +195,33 @@ _FinalStage metricPeriodMonthReset( _FinalStage valueTraitId(Optional valueTraitId); _FinalStage valueTraitId(String valueTraitId); + + _FinalStage yearlyMeteredPriceId(Optional yearlyMeteredPriceId); + + _FinalStage yearlyMeteredPriceId(String yearlyMeteredPriceId); } @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder implements ValueTypeStage, _FinalStage { private UpdatePlanEntitlementRequestBodyValueType valueType; + private Optional yearlyMeteredPriceId = Optional.empty(); + private Optional valueTraitId = Optional.empty(); private Optional valueNumeric = Optional.empty(); private Optional valueBool = Optional.empty(); + private Optional priceBehavior = Optional.empty(); + + private Optional monthlyMeteredPriceId = Optional.empty(); + private Optional metricPeriodMonthReset = Optional.empty(); private Optional metricPeriod = Optional.empty(); - private Optional meteredYearlyPriceId = Optional.empty(); - - private Optional meteredMonthlyPriceId = Optional.empty(); - @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -212,14 +229,15 @@ private Builder() {} @java.lang.Override public Builder from(UpdatePlanEntitlementRequestBody other) { - meteredMonthlyPriceId(other.getMeteredMonthlyPriceId()); - meteredYearlyPriceId(other.getMeteredYearlyPriceId()); metricPeriod(other.getMetricPeriod()); metricPeriodMonthReset(other.getMetricPeriodMonthReset()); + monthlyMeteredPriceId(other.getMonthlyMeteredPriceId()); + priceBehavior(other.getPriceBehavior()); valueBool(other.getValueBool()); valueNumeric(other.getValueNumeric()); valueTraitId(other.getValueTraitId()); valueType(other.getValueType()); + yearlyMeteredPriceId(other.getYearlyMeteredPriceId()); return this; } @@ -230,9 +248,22 @@ public _FinalStage valueType(UpdatePlanEntitlementRequestBodyValueType valueType return this; } + @java.lang.Override + public _FinalStage yearlyMeteredPriceId(String yearlyMeteredPriceId) { + this.yearlyMeteredPriceId = Optional.ofNullable(yearlyMeteredPriceId); + return this; + } + + @java.lang.Override + @JsonSetter(value = "yearly_metered_price_id", nulls = Nulls.SKIP) + public _FinalStage yearlyMeteredPriceId(Optional yearlyMeteredPriceId) { + this.yearlyMeteredPriceId = yearlyMeteredPriceId; + return this; + } + @java.lang.Override public _FinalStage valueTraitId(String valueTraitId) { - this.valueTraitId = Optional.of(valueTraitId); + this.valueTraitId = Optional.ofNullable(valueTraitId); return this; } @@ -245,7 +276,7 @@ public _FinalStage valueTraitId(Optional valueTraitId) { @java.lang.Override public _FinalStage valueNumeric(Integer valueNumeric) { - this.valueNumeric = Optional.of(valueNumeric); + this.valueNumeric = Optional.ofNullable(valueNumeric); return this; } @@ -258,7 +289,7 @@ public _FinalStage valueNumeric(Optional valueNumeric) { @java.lang.Override public _FinalStage valueBool(Boolean valueBool) { - this.valueBool = Optional.of(valueBool); + this.valueBool = Optional.ofNullable(valueBool); return this; } @@ -270,70 +301,71 @@ public _FinalStage valueBool(Optional valueBool) { } @java.lang.Override - public _FinalStage metricPeriodMonthReset( - UpdatePlanEntitlementRequestBodyMetricPeriodMonthReset metricPeriodMonthReset) { - this.metricPeriodMonthReset = Optional.of(metricPeriodMonthReset); + public _FinalStage priceBehavior(String priceBehavior) { + this.priceBehavior = Optional.ofNullable(priceBehavior); return this; } @java.lang.Override - @JsonSetter(value = "metric_period_month_reset", nulls = Nulls.SKIP) - public _FinalStage metricPeriodMonthReset( - Optional metricPeriodMonthReset) { - this.metricPeriodMonthReset = metricPeriodMonthReset; + @JsonSetter(value = "price_behavior", nulls = Nulls.SKIP) + public _FinalStage priceBehavior(Optional priceBehavior) { + this.priceBehavior = priceBehavior; return this; } @java.lang.Override - public _FinalStage metricPeriod(UpdatePlanEntitlementRequestBodyMetricPeriod metricPeriod) { - this.metricPeriod = Optional.of(metricPeriod); + public _FinalStage monthlyMeteredPriceId(String monthlyMeteredPriceId) { + this.monthlyMeteredPriceId = Optional.ofNullable(monthlyMeteredPriceId); return this; } @java.lang.Override - @JsonSetter(value = "metric_period", nulls = Nulls.SKIP) - public _FinalStage metricPeriod(Optional metricPeriod) { - this.metricPeriod = metricPeriod; + @JsonSetter(value = "monthly_metered_price_id", nulls = Nulls.SKIP) + public _FinalStage monthlyMeteredPriceId(Optional monthlyMeteredPriceId) { + this.monthlyMeteredPriceId = monthlyMeteredPriceId; return this; } @java.lang.Override - public _FinalStage meteredYearlyPriceId(String meteredYearlyPriceId) { - this.meteredYearlyPriceId = Optional.of(meteredYearlyPriceId); + public _FinalStage metricPeriodMonthReset( + UpdatePlanEntitlementRequestBodyMetricPeriodMonthReset metricPeriodMonthReset) { + this.metricPeriodMonthReset = Optional.ofNullable(metricPeriodMonthReset); return this; } @java.lang.Override - @JsonSetter(value = "metered_yearly_price_id", nulls = Nulls.SKIP) - public _FinalStage meteredYearlyPriceId(Optional meteredYearlyPriceId) { - this.meteredYearlyPriceId = meteredYearlyPriceId; + @JsonSetter(value = "metric_period_month_reset", nulls = Nulls.SKIP) + public _FinalStage metricPeriodMonthReset( + Optional metricPeriodMonthReset) { + this.metricPeriodMonthReset = metricPeriodMonthReset; return this; } @java.lang.Override - public _FinalStage meteredMonthlyPriceId(String meteredMonthlyPriceId) { - this.meteredMonthlyPriceId = Optional.of(meteredMonthlyPriceId); + public _FinalStage metricPeriod(UpdatePlanEntitlementRequestBodyMetricPeriod metricPeriod) { + this.metricPeriod = Optional.ofNullable(metricPeriod); return this; } @java.lang.Override - @JsonSetter(value = "metered_monthly_price_id", nulls = Nulls.SKIP) - public _FinalStage meteredMonthlyPriceId(Optional meteredMonthlyPriceId) { - this.meteredMonthlyPriceId = meteredMonthlyPriceId; + @JsonSetter(value = "metric_period", nulls = Nulls.SKIP) + public _FinalStage metricPeriod(Optional metricPeriod) { + this.metricPeriod = metricPeriod; return this; } @java.lang.Override public UpdatePlanEntitlementRequestBody build() { return new UpdatePlanEntitlementRequestBody( - meteredMonthlyPriceId, - meteredYearlyPriceId, metricPeriod, metricPeriodMonthReset, + monthlyMeteredPriceId, + priceBehavior, valueBool, valueNumeric, valueTraitId, valueType, + yearlyMeteredPriceId, additionalProperties); } } diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CountCompanyOverridesParams.java b/src/main/java/com/schematic/api/resources/entitlements/types/CountCompanyOverridesParams.java index 68f01fe..adfc2c3 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CountCompanyOverridesParams.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CountCompanyOverridesParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountCompanyOverridesParams.Builder.class) public final class CountCompanyOverridesParams { private final Optional companyId; @@ -37,6 +37,8 @@ public final class CountCompanyOverridesParams { private final Optional q; + private final Optional withoutExpired; + private final Map additionalProperties; private CountCompanyOverridesParams( @@ -48,6 +50,7 @@ private CountCompanyOverridesParams( Optional limit, Optional offset, Optional q, + Optional withoutExpired, Map additionalProperties) { this.companyId = companyId; this.companyIds = companyIds; @@ -57,6 +60,7 @@ private CountCompanyOverridesParams( this.limit = limit; this.offset = offset; this.q = q; + this.withoutExpired = withoutExpired; this.additionalProperties = additionalProperties; } @@ -124,6 +128,14 @@ public Optional getQ() { return q; } + /** + * @return Filter company overrides by whether they have not expired + */ + @JsonProperty("without_expired") + public Optional getWithoutExpired() { + return withoutExpired; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -143,7 +155,8 @@ private boolean equalTo(CountCompanyOverridesParams other) { && ids.equals(other.ids) && limit.equals(other.limit) && offset.equals(other.offset) - && q.equals(other.q); + && q.equals(other.q) + && withoutExpired.equals(other.withoutExpired); } @java.lang.Override @@ -156,7 +169,8 @@ public int hashCode() { this.ids, this.limit, this.offset, - this.q); + this.q, + this.withoutExpired); } @java.lang.Override @@ -186,6 +200,8 @@ public static final class Builder { private Optional q = Optional.empty(); + private Optional withoutExpired = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -200,6 +216,7 @@ public Builder from(CountCompanyOverridesParams other) { limit(other.getLimit()); offset(other.getOffset()); q(other.getQ()); + withoutExpired(other.getWithoutExpired()); return this; } @@ -210,7 +227,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -221,7 +238,7 @@ public Builder companyIds(Optional> companyIds) { } public Builder companyIds(List companyIds) { - this.companyIds = Optional.of(companyIds); + this.companyIds = Optional.ofNullable(companyIds); return this; } @@ -232,7 +249,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -243,7 +260,7 @@ public Builder featureIds(Optional> featureIds) { } public Builder featureIds(List featureIds) { - this.featureIds = Optional.of(featureIds); + this.featureIds = Optional.ofNullable(featureIds); return this; } @@ -254,7 +271,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -265,7 +282,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -276,7 +293,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -287,13 +304,33 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); + return this; + } + + @JsonSetter(value = "without_expired", nulls = Nulls.SKIP) + public Builder withoutExpired(Optional withoutExpired) { + this.withoutExpired = withoutExpired; + return this; + } + + public Builder withoutExpired(Boolean withoutExpired) { + this.withoutExpired = Optional.ofNullable(withoutExpired); return this; } public CountCompanyOverridesParams build() { return new CountCompanyOverridesParams( - companyId, companyIds, featureId, featureIds, ids, limit, offset, q, additionalProperties); + companyId, + companyIds, + featureId, + featureIds, + ids, + limit, + offset, + q, + withoutExpired, + additionalProperties); } } } diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CountCompanyOverridesResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/CountCompanyOverridesResponse.java index ffbad12..f775df7 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CountCompanyOverridesResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CountCompanyOverridesResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountCompanyOverridesResponse.Builder.class) public final class CountCompanyOverridesResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureCompaniesParams.java b/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureCompaniesParams.java index a57a015..20cde87 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureCompaniesParams.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureCompaniesParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFeatureCompaniesParams.Builder.class) public final class CountFeatureCompaniesParams { private final Optional featureId; @@ -131,7 +131,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -142,7 +142,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -153,7 +153,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -164,7 +164,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureCompaniesResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureCompaniesResponse.java index e986cb5..580531d 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureCompaniesResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureCompaniesResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFeatureCompaniesResponse.Builder.class) public final class CountFeatureCompaniesResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsageParams.java b/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsageParams.java index 6669447..6e97708 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsageParams.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsageParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFeatureUsageParams.Builder.class) public final class CountFeatureUsageParams { private final Optional companyId; @@ -178,7 +178,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -189,7 +189,7 @@ public Builder companyKeys(Optional> companyKeys) { } public Builder companyKeys(Map companyKeys) { - this.companyKeys = Optional.of(companyKeys); + this.companyKeys = Optional.ofNullable(companyKeys); return this; } @@ -200,7 +200,7 @@ public Builder featureIds(Optional> featureIds) { } public Builder featureIds(List featureIds) { - this.featureIds = Optional.of(featureIds); + this.featureIds = Optional.ofNullable(featureIds); return this; } @@ -211,7 +211,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -222,7 +222,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -233,7 +233,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -244,7 +244,7 @@ public Builder withoutNegativeEntitlements(Optional withoutNegativeEnti } public Builder withoutNegativeEntitlements(Boolean withoutNegativeEntitlements) { - this.withoutNegativeEntitlements = Optional.of(withoutNegativeEntitlements); + this.withoutNegativeEntitlements = Optional.ofNullable(withoutNegativeEntitlements); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsageResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsageResponse.java index ec2e047..85b1697 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsageResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsageResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFeatureUsageResponse.Builder.class) public final class CountFeatureUsageResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsersParams.java b/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsersParams.java index d7d7659..e9d1faa 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsersParams.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsersParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFeatureUsersParams.Builder.class) public final class CountFeatureUsersParams { private final Optional featureId; @@ -131,7 +131,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -142,7 +142,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -153,7 +153,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -164,7 +164,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsersResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsersResponse.java index 4b3820a..338ef73 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsersResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CountFeatureUsersResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFeatureUsersResponse.Builder.class) public final class CountFeatureUsersResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CountPlanEntitlementsParams.java b/src/main/java/com/schematic/api/resources/entitlements/types/CountPlanEntitlementsParams.java index 1b180cf..57f41fb 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CountPlanEntitlementsParams.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CountPlanEntitlementsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountPlanEntitlementsParams.Builder.class) public final class CountPlanEntitlementsParams { private final Optional featureId; @@ -227,7 +227,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -238,7 +238,7 @@ public Builder featureIds(Optional> featureIds) { } public Builder featureIds(List featureIds) { - this.featureIds = Optional.of(featureIds); + this.featureIds = Optional.ofNullable(featureIds); return this; } @@ -249,7 +249,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -260,7 +260,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -271,7 +271,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -282,7 +282,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -293,7 +293,7 @@ public Builder planIds(Optional> planIds) { } public Builder planIds(List planIds) { - this.planIds = Optional.of(planIds); + this.planIds = Optional.ofNullable(planIds); return this; } @@ -304,7 +304,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -315,7 +315,7 @@ public Builder withMeteredProducts(Optional withMeteredProducts) { } public Builder withMeteredProducts(Boolean withMeteredProducts) { - this.withMeteredProducts = Optional.of(withMeteredProducts); + this.withMeteredProducts = Optional.ofNullable(withMeteredProducts); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CountPlanEntitlementsResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/CountPlanEntitlementsResponse.java index f1bed29..b3a5955 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CountPlanEntitlementsResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CountPlanEntitlementsResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountPlanEntitlementsResponse.Builder.class) public final class CountPlanEntitlementsResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CreateCompanyOverrideRequestBodyMetricPeriod.java b/src/main/java/com/schematic/api/resources/entitlements/types/CreateCompanyOverrideRequestBodyMetricPeriod.java index ab16697..bdc9c3f 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CreateCompanyOverrideRequestBodyMetricPeriod.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CreateCompanyOverrideRequestBodyMetricPeriod.java @@ -8,8 +8,6 @@ public enum CreateCompanyOverrideRequestBodyMetricPeriod { ALL_TIME("all_time"), - BILLING("billing"), - CURRENT_MONTH("current_month"), CURRENT_WEEK("current_week"), diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CreateCompanyOverrideResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/CreateCompanyOverrideResponse.java index 70b64b4..4e66e46 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CreateCompanyOverrideResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CreateCompanyOverrideResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateCompanyOverrideResponse.Builder.class) public final class CreateCompanyOverrideResponse { private final CompanyOverrideResponseData data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CreatePlanEntitlementRequestBodyMetricPeriod.java b/src/main/java/com/schematic/api/resources/entitlements/types/CreatePlanEntitlementRequestBodyMetricPeriod.java index 71d979b..398d3bb 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CreatePlanEntitlementRequestBodyMetricPeriod.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CreatePlanEntitlementRequestBodyMetricPeriod.java @@ -8,8 +8,6 @@ public enum CreatePlanEntitlementRequestBodyMetricPeriod { ALL_TIME("all_time"), - BILLING("billing"), - CURRENT_MONTH("current_month"), CURRENT_WEEK("current_week"), diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/CreatePlanEntitlementResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/CreatePlanEntitlementResponse.java index 48068e7..650fd7d 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/CreatePlanEntitlementResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/CreatePlanEntitlementResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreatePlanEntitlementResponse.Builder.class) public final class CreatePlanEntitlementResponse { private final PlanEntitlementResponseData data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/DeleteCompanyOverrideResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/DeleteCompanyOverrideResponse.java index dab74fc..54bd73e 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/DeleteCompanyOverrideResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/DeleteCompanyOverrideResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteCompanyOverrideResponse.Builder.class) public final class DeleteCompanyOverrideResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/DeletePlanEntitlementResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/DeletePlanEntitlementResponse.java index 19625af..df37c9f 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/DeletePlanEntitlementResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/DeletePlanEntitlementResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeletePlanEntitlementResponse.Builder.class) public final class DeletePlanEntitlementResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/GetCompanyOverrideResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/GetCompanyOverrideResponse.java index f852fd8..f690799 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/GetCompanyOverrideResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/GetCompanyOverrideResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetCompanyOverrideResponse.Builder.class) public final class GetCompanyOverrideResponse { private final CompanyOverrideResponseData data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/GetFeatureUsageByCompanyParams.java b/src/main/java/com/schematic/api/resources/entitlements/types/GetFeatureUsageByCompanyParams.java index dbcc72a..e8ffc11 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/GetFeatureUsageByCompanyParams.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/GetFeatureUsageByCompanyParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetFeatureUsageByCompanyParams.Builder.class) public final class GetFeatureUsageByCompanyParams { private final Optional> keys; @@ -86,7 +86,7 @@ public Builder keys(Optional> keys) { } public Builder keys(Map keys) { - this.keys = Optional.of(keys); + this.keys = Optional.ofNullable(keys); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/GetFeatureUsageByCompanyResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/GetFeatureUsageByCompanyResponse.java index a036257..07156a1 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/GetFeatureUsageByCompanyResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/GetFeatureUsageByCompanyResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetFeatureUsageByCompanyResponse.Builder.class) public final class GetFeatureUsageByCompanyResponse { private final FeatureUsageDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/GetPlanEntitlementResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/GetPlanEntitlementResponse.java index 39f2525..670f166 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/GetPlanEntitlementResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/GetPlanEntitlementResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetPlanEntitlementResponse.Builder.class) public final class GetPlanEntitlementResponse { private final PlanEntitlementResponseData data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/ListCompanyOverridesParams.java b/src/main/java/com/schematic/api/resources/entitlements/types/ListCompanyOverridesParams.java index 5599712..86ca1c5 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/ListCompanyOverridesParams.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/ListCompanyOverridesParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCompanyOverridesParams.Builder.class) public final class ListCompanyOverridesParams { private final Optional companyId; @@ -37,6 +37,8 @@ public final class ListCompanyOverridesParams { private final Optional q; + private final Optional withoutExpired; + private final Map additionalProperties; private ListCompanyOverridesParams( @@ -48,6 +50,7 @@ private ListCompanyOverridesParams( Optional limit, Optional offset, Optional q, + Optional withoutExpired, Map additionalProperties) { this.companyId = companyId; this.companyIds = companyIds; @@ -57,6 +60,7 @@ private ListCompanyOverridesParams( this.limit = limit; this.offset = offset; this.q = q; + this.withoutExpired = withoutExpired; this.additionalProperties = additionalProperties; } @@ -124,6 +128,14 @@ public Optional getQ() { return q; } + /** + * @return Filter company overrides by whether they have not expired + */ + @JsonProperty("without_expired") + public Optional getWithoutExpired() { + return withoutExpired; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -143,7 +155,8 @@ private boolean equalTo(ListCompanyOverridesParams other) { && ids.equals(other.ids) && limit.equals(other.limit) && offset.equals(other.offset) - && q.equals(other.q); + && q.equals(other.q) + && withoutExpired.equals(other.withoutExpired); } @java.lang.Override @@ -156,7 +169,8 @@ public int hashCode() { this.ids, this.limit, this.offset, - this.q); + this.q, + this.withoutExpired); } @java.lang.Override @@ -186,6 +200,8 @@ public static final class Builder { private Optional q = Optional.empty(); + private Optional withoutExpired = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -200,6 +216,7 @@ public Builder from(ListCompanyOverridesParams other) { limit(other.getLimit()); offset(other.getOffset()); q(other.getQ()); + withoutExpired(other.getWithoutExpired()); return this; } @@ -210,7 +227,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -221,7 +238,7 @@ public Builder companyIds(Optional> companyIds) { } public Builder companyIds(List companyIds) { - this.companyIds = Optional.of(companyIds); + this.companyIds = Optional.ofNullable(companyIds); return this; } @@ -232,7 +249,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -243,7 +260,7 @@ public Builder featureIds(Optional> featureIds) { } public Builder featureIds(List featureIds) { - this.featureIds = Optional.of(featureIds); + this.featureIds = Optional.ofNullable(featureIds); return this; } @@ -254,7 +271,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -265,7 +282,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -276,7 +293,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -287,13 +304,33 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); + return this; + } + + @JsonSetter(value = "without_expired", nulls = Nulls.SKIP) + public Builder withoutExpired(Optional withoutExpired) { + this.withoutExpired = withoutExpired; + return this; + } + + public Builder withoutExpired(Boolean withoutExpired) { + this.withoutExpired = Optional.ofNullable(withoutExpired); return this; } public ListCompanyOverridesParams build() { return new ListCompanyOverridesParams( - companyId, companyIds, featureId, featureIds, ids, limit, offset, q, additionalProperties); + companyId, + companyIds, + featureId, + featureIds, + ids, + limit, + offset, + q, + withoutExpired, + additionalProperties); } } } diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/ListCompanyOverridesResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/ListCompanyOverridesResponse.java index a01b624..f5ed141 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/ListCompanyOverridesResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/ListCompanyOverridesResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListCompanyOverridesResponse.Builder.class) public final class ListCompanyOverridesResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureCompaniesParams.java b/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureCompaniesParams.java index a1c89e4..e3d6ba3 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureCompaniesParams.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureCompaniesParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFeatureCompaniesParams.Builder.class) public final class ListFeatureCompaniesParams { private final Optional featureId; @@ -131,7 +131,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -142,7 +142,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -153,7 +153,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -164,7 +164,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureCompaniesResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureCompaniesResponse.java index 603a4cb..33ecfa8 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureCompaniesResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureCompaniesResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFeatureCompaniesResponse.Builder.class) public final class ListFeatureCompaniesResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsageParams.java b/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsageParams.java index 4584f4e..db0a613 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsageParams.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsageParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFeatureUsageParams.Builder.class) public final class ListFeatureUsageParams { private final Optional companyId; @@ -178,7 +178,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -189,7 +189,7 @@ public Builder companyKeys(Optional> companyKeys) { } public Builder companyKeys(Map companyKeys) { - this.companyKeys = Optional.of(companyKeys); + this.companyKeys = Optional.ofNullable(companyKeys); return this; } @@ -200,7 +200,7 @@ public Builder featureIds(Optional> featureIds) { } public Builder featureIds(List featureIds) { - this.featureIds = Optional.of(featureIds); + this.featureIds = Optional.ofNullable(featureIds); return this; } @@ -211,7 +211,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -222,7 +222,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -233,7 +233,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -244,7 +244,7 @@ public Builder withoutNegativeEntitlements(Optional withoutNegativeEnti } public Builder withoutNegativeEntitlements(Boolean withoutNegativeEntitlements) { - this.withoutNegativeEntitlements = Optional.of(withoutNegativeEntitlements); + this.withoutNegativeEntitlements = Optional.ofNullable(withoutNegativeEntitlements); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsageResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsageResponse.java index d7f2b6b..210596a 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsageResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsageResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFeatureUsageResponse.Builder.class) public final class ListFeatureUsageResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsersParams.java b/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsersParams.java index 42e08b3..34927d9 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsersParams.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsersParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFeatureUsersParams.Builder.class) public final class ListFeatureUsersParams { private final Optional featureId; @@ -131,7 +131,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -142,7 +142,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -153,7 +153,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -164,7 +164,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsersResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsersResponse.java index 005f0ea..ce77e6a 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsersResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/ListFeatureUsersResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFeatureUsersResponse.Builder.class) public final class ListFeatureUsersResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/ListPlanEntitlementsParams.java b/src/main/java/com/schematic/api/resources/entitlements/types/ListPlanEntitlementsParams.java index ad5b8d5..5305509 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/ListPlanEntitlementsParams.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/ListPlanEntitlementsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListPlanEntitlementsParams.Builder.class) public final class ListPlanEntitlementsParams { private final Optional featureId; @@ -227,7 +227,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -238,7 +238,7 @@ public Builder featureIds(Optional> featureIds) { } public Builder featureIds(List featureIds) { - this.featureIds = Optional.of(featureIds); + this.featureIds = Optional.ofNullable(featureIds); return this; } @@ -249,7 +249,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -260,7 +260,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -271,7 +271,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -282,7 +282,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -293,7 +293,7 @@ public Builder planIds(Optional> planIds) { } public Builder planIds(List planIds) { - this.planIds = Optional.of(planIds); + this.planIds = Optional.ofNullable(planIds); return this; } @@ -304,7 +304,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -315,7 +315,7 @@ public Builder withMeteredProducts(Optional withMeteredProducts) { } public Builder withMeteredProducts(Boolean withMeteredProducts) { - this.withMeteredProducts = Optional.of(withMeteredProducts); + this.withMeteredProducts = Optional.ofNullable(withMeteredProducts); return this; } diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/ListPlanEntitlementsResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/ListPlanEntitlementsResponse.java index 16e2cd3..80041d4 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/ListPlanEntitlementsResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/ListPlanEntitlementsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListPlanEntitlementsResponse.Builder.class) public final class ListPlanEntitlementsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/UpdateCompanyOverrideRequestBodyMetricPeriod.java b/src/main/java/com/schematic/api/resources/entitlements/types/UpdateCompanyOverrideRequestBodyMetricPeriod.java index 7df3654..923aaaf 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/UpdateCompanyOverrideRequestBodyMetricPeriod.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/UpdateCompanyOverrideRequestBodyMetricPeriod.java @@ -8,8 +8,6 @@ public enum UpdateCompanyOverrideRequestBodyMetricPeriod { ALL_TIME("all_time"), - BILLING("billing"), - CURRENT_MONTH("current_month"), CURRENT_WEEK("current_week"), diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/UpdateCompanyOverrideResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/UpdateCompanyOverrideResponse.java index 410f2d9..de1c2af 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/UpdateCompanyOverrideResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/UpdateCompanyOverrideResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateCompanyOverrideResponse.Builder.class) public final class UpdateCompanyOverrideResponse { private final CompanyOverrideResponseData data; diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/UpdatePlanEntitlementRequestBodyMetricPeriod.java b/src/main/java/com/schematic/api/resources/entitlements/types/UpdatePlanEntitlementRequestBodyMetricPeriod.java index 4dd6f89..22453cd 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/UpdatePlanEntitlementRequestBodyMetricPeriod.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/UpdatePlanEntitlementRequestBodyMetricPeriod.java @@ -8,8 +8,6 @@ public enum UpdatePlanEntitlementRequestBodyMetricPeriod { ALL_TIME("all_time"), - BILLING("billing"), - CURRENT_MONTH("current_month"), CURRENT_WEEK("current_week"), diff --git a/src/main/java/com/schematic/api/resources/entitlements/types/UpdatePlanEntitlementResponse.java b/src/main/java/com/schematic/api/resources/entitlements/types/UpdatePlanEntitlementResponse.java index e9a3606..ce2ff39 100644 --- a/src/main/java/com/schematic/api/resources/entitlements/types/UpdatePlanEntitlementResponse.java +++ b/src/main/java/com/schematic/api/resources/entitlements/types/UpdatePlanEntitlementResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdatePlanEntitlementResponse.Builder.class) public final class UpdatePlanEntitlementResponse { private final PlanEntitlementResponseData data; diff --git a/src/main/java/com/schematic/api/resources/events/requests/CreateEventBatchRequestBody.java b/src/main/java/com/schematic/api/resources/events/requests/CreateEventBatchRequestBody.java index bdfab8b..5eb5a3b 100644 --- a/src/main/java/com/schematic/api/resources/events/requests/CreateEventBatchRequestBody.java +++ b/src/main/java/com/schematic/api/resources/events/requests/CreateEventBatchRequestBody.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateEventBatchRequestBody.Builder.class) public final class CreateEventBatchRequestBody { private final List events; diff --git a/src/main/java/com/schematic/api/resources/events/requests/GetEventSummariesRequest.java b/src/main/java/com/schematic/api/resources/events/requests/GetEventSummariesRequest.java index debcacd..8d273b7 100644 --- a/src/main/java/com/schematic/api/resources/events/requests/GetEventSummariesRequest.java +++ b/src/main/java/com/schematic/api/resources/events/requests/GetEventSummariesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetEventSummariesRequest.Builder.class) public final class GetEventSummariesRequest { private final Optional q; @@ -131,7 +131,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -142,7 +142,7 @@ public Builder eventSubtypes(Optional eventSubtypes) { } public Builder eventSubtypes(String eventSubtypes) { - this.eventSubtypes = Optional.of(eventSubtypes); + this.eventSubtypes = Optional.ofNullable(eventSubtypes); return this; } @@ -153,7 +153,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -164,7 +164,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/events/requests/ListEventsRequest.java b/src/main/java/com/schematic/api/resources/events/requests/ListEventsRequest.java index d208282..f89d537 100644 --- a/src/main/java/com/schematic/api/resources/events/requests/ListEventsRequest.java +++ b/src/main/java/com/schematic/api/resources/events/requests/ListEventsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListEventsRequest.Builder.class) public final class ListEventsRequest { private final Optional companyId; @@ -171,7 +171,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -182,7 +182,7 @@ public Builder eventSubtype(Optional eventSubtype) { } public Builder eventSubtype(String eventSubtype) { - this.eventSubtype = Optional.of(eventSubtype); + this.eventSubtype = Optional.ofNullable(eventSubtype); return this; } @@ -193,7 +193,7 @@ public Builder eventTypes(Optional eventTypes) { } public Builder eventTypes(String eventTypes) { - this.eventTypes = Optional.of(eventTypes); + this.eventTypes = Optional.ofNullable(eventTypes); return this; } @@ -204,7 +204,7 @@ public Builder flagId(Optional flagId) { } public Builder flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } @@ -215,7 +215,7 @@ public Builder userId(Optional userId) { } public Builder userId(String userId) { - this.userId = Optional.of(userId); + this.userId = Optional.ofNullable(userId); return this; } @@ -226,7 +226,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -237,7 +237,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/events/types/CreateEventBatchResponse.java b/src/main/java/com/schematic/api/resources/events/types/CreateEventBatchResponse.java index cb252fa..611e56b 100644 --- a/src/main/java/com/schematic/api/resources/events/types/CreateEventBatchResponse.java +++ b/src/main/java/com/schematic/api/resources/events/types/CreateEventBatchResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateEventBatchResponse.Builder.class) public final class CreateEventBatchResponse { private final RawEventBatchResponseData data; diff --git a/src/main/java/com/schematic/api/resources/events/types/CreateEventResponse.java b/src/main/java/com/schematic/api/resources/events/types/CreateEventResponse.java index a99d36e..6e07af9 100644 --- a/src/main/java/com/schematic/api/resources/events/types/CreateEventResponse.java +++ b/src/main/java/com/schematic/api/resources/events/types/CreateEventResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateEventResponse.Builder.class) public final class CreateEventResponse { private final RawEventResponseData data; diff --git a/src/main/java/com/schematic/api/resources/events/types/GetEventResponse.java b/src/main/java/com/schematic/api/resources/events/types/GetEventResponse.java index 2d0ad35..1759728 100644 --- a/src/main/java/com/schematic/api/resources/events/types/GetEventResponse.java +++ b/src/main/java/com/schematic/api/resources/events/types/GetEventResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetEventResponse.Builder.class) public final class GetEventResponse { private final EventDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/events/types/GetEventSummariesParams.java b/src/main/java/com/schematic/api/resources/events/types/GetEventSummariesParams.java index a8c1843..79e368d 100644 --- a/src/main/java/com/schematic/api/resources/events/types/GetEventSummariesParams.java +++ b/src/main/java/com/schematic/api/resources/events/types/GetEventSummariesParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetEventSummariesParams.Builder.class) public final class GetEventSummariesParams { private final Optional> eventSubtypes; @@ -132,7 +132,7 @@ public Builder eventSubtypes(Optional> eventSubtypes) { } public Builder eventSubtypes(List eventSubtypes) { - this.eventSubtypes = Optional.of(eventSubtypes); + this.eventSubtypes = Optional.ofNullable(eventSubtypes); return this; } @@ -143,7 +143,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -154,7 +154,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -165,7 +165,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/events/types/GetEventSummariesResponse.java b/src/main/java/com/schematic/api/resources/events/types/GetEventSummariesResponse.java index 2ef5aea..a1cfd7a 100644 --- a/src/main/java/com/schematic/api/resources/events/types/GetEventSummariesResponse.java +++ b/src/main/java/com/schematic/api/resources/events/types/GetEventSummariesResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetEventSummariesResponse.Builder.class) public final class GetEventSummariesResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/events/types/GetSegmentIntegrationStatusResponse.java b/src/main/java/com/schematic/api/resources/events/types/GetSegmentIntegrationStatusResponse.java index fa546c9..6b912cd 100644 --- a/src/main/java/com/schematic/api/resources/events/types/GetSegmentIntegrationStatusResponse.java +++ b/src/main/java/com/schematic/api/resources/events/types/GetSegmentIntegrationStatusResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetSegmentIntegrationStatusResponse.Builder.class) public final class GetSegmentIntegrationStatusResponse { private final SegmentStatusResp data; diff --git a/src/main/java/com/schematic/api/resources/events/types/ListEventsParams.java b/src/main/java/com/schematic/api/resources/events/types/ListEventsParams.java index 53292e9..06c04d5 100644 --- a/src/main/java/com/schematic/api/resources/events/types/ListEventsParams.java +++ b/src/main/java/com/schematic/api/resources/events/types/ListEventsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListEventsParams.Builder.class) public final class ListEventsParams { private final Optional companyId; @@ -172,7 +172,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -183,7 +183,7 @@ public Builder eventSubtype(Optional eventSubtype) { } public Builder eventSubtype(String eventSubtype) { - this.eventSubtype = Optional.of(eventSubtype); + this.eventSubtype = Optional.ofNullable(eventSubtype); return this; } @@ -194,7 +194,7 @@ public Builder eventTypes(Optional> eventTypes) { } public Builder eventTypes(List eventTypes) { - this.eventTypes = Optional.of(eventTypes); + this.eventTypes = Optional.ofNullable(eventTypes); return this; } @@ -205,7 +205,7 @@ public Builder flagId(Optional flagId) { } public Builder flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } @@ -216,7 +216,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -227,7 +227,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -238,7 +238,7 @@ public Builder userId(Optional userId) { } public Builder userId(String userId) { - this.userId = Optional.of(userId); + this.userId = Optional.ofNullable(userId); return this; } diff --git a/src/main/java/com/schematic/api/resources/events/types/ListEventsResponse.java b/src/main/java/com/schematic/api/resources/events/types/ListEventsResponse.java index d0fbe39..67deb27 100644 --- a/src/main/java/com/schematic/api/resources/events/types/ListEventsResponse.java +++ b/src/main/java/com/schematic/api/resources/events/types/ListEventsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListEventsResponse.Builder.class) public final class ListEventsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/features/requests/CountFeaturesRequest.java b/src/main/java/com/schematic/api/resources/features/requests/CountFeaturesRequest.java index 301a91d..4235889 100644 --- a/src/main/java/com/schematic/api/resources/features/requests/CountFeaturesRequest.java +++ b/src/main/java/com/schematic/api/resources/features/requests/CountFeaturesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFeaturesRequest.Builder.class) public final class CountFeaturesRequest { private final Optional ids; @@ -169,7 +169,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -180,7 +180,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -191,7 +191,7 @@ public Builder withoutCompanyOverrideFor(Optional withoutCompanyOverride } public Builder withoutCompanyOverrideFor(String withoutCompanyOverrideFor) { - this.withoutCompanyOverrideFor = Optional.of(withoutCompanyOverrideFor); + this.withoutCompanyOverrideFor = Optional.ofNullable(withoutCompanyOverrideFor); return this; } @@ -202,7 +202,7 @@ public Builder withoutPlanEntitlementFor(Optional withoutPlanEntitlement } public Builder withoutPlanEntitlementFor(String withoutPlanEntitlementFor) { - this.withoutPlanEntitlementFor = Optional.of(withoutPlanEntitlementFor); + this.withoutPlanEntitlementFor = Optional.ofNullable(withoutPlanEntitlementFor); return this; } @@ -213,7 +213,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -224,7 +224,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/features/requests/CountFlagsRequest.java b/src/main/java/com/schematic/api/resources/features/requests/CountFlagsRequest.java index 41a7660..c2b534a 100644 --- a/src/main/java/com/schematic/api/resources/features/requests/CountFlagsRequest.java +++ b/src/main/java/com/schematic/api/resources/features/requests/CountFlagsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFlagsRequest.Builder.class) public final class CountFlagsRequest { private final Optional featureId; @@ -144,7 +144,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -155,7 +155,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -166,7 +166,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -177,7 +177,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -188,7 +188,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/features/requests/CreateFeatureRequestBody.java b/src/main/java/com/schematic/api/resources/features/requests/CreateFeatureRequestBody.java index ede55d4..a175a32 100644 --- a/src/main/java/com/schematic/api/resources/features/requests/CreateFeatureRequestBody.java +++ b/src/main/java/com/schematic/api/resources/features/requests/CreateFeatureRequestBody.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateFeatureRequestBody.Builder.class) public final class CreateFeatureRequestBody { private final String description; @@ -260,7 +260,7 @@ public _FinalStage name(String name) { @java.lang.Override public _FinalStage traitId(String traitId) { - this.traitId = Optional.of(traitId); + this.traitId = Optional.ofNullable(traitId); return this; } @@ -273,7 +273,7 @@ public _FinalStage traitId(Optional traitId) { @java.lang.Override public _FinalStage maintainerId(String maintainerId) { - this.maintainerId = Optional.of(maintainerId); + this.maintainerId = Optional.ofNullable(maintainerId); return this; } @@ -286,7 +286,7 @@ public _FinalStage maintainerId(Optional maintainerId) { @java.lang.Override public _FinalStage lifecyclePhase(String lifecyclePhase) { - this.lifecyclePhase = Optional.of(lifecyclePhase); + this.lifecyclePhase = Optional.ofNullable(lifecyclePhase); return this; } @@ -299,7 +299,7 @@ public _FinalStage lifecyclePhase(Optional lifecyclePhase) { @java.lang.Override public _FinalStage icon(String icon) { - this.icon = Optional.of(icon); + this.icon = Optional.ofNullable(icon); return this; } @@ -312,7 +312,7 @@ public _FinalStage icon(Optional icon) { @java.lang.Override public _FinalStage flag(CreateOrUpdateFlagRequestBody flag) { - this.flag = Optional.of(flag); + this.flag = Optional.ofNullable(flag); return this; } @@ -325,7 +325,7 @@ public _FinalStage flag(Optional flag) { @java.lang.Override public _FinalStage eventSubtype(String eventSubtype) { - this.eventSubtype = Optional.of(eventSubtype); + this.eventSubtype = Optional.ofNullable(eventSubtype); return this; } diff --git a/src/main/java/com/schematic/api/resources/features/requests/ListFeaturesRequest.java b/src/main/java/com/schematic/api/resources/features/requests/ListFeaturesRequest.java index 367bb0c..94c826b 100644 --- a/src/main/java/com/schematic/api/resources/features/requests/ListFeaturesRequest.java +++ b/src/main/java/com/schematic/api/resources/features/requests/ListFeaturesRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFeaturesRequest.Builder.class) public final class ListFeaturesRequest { private final Optional ids; @@ -169,7 +169,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -180,7 +180,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -191,7 +191,7 @@ public Builder withoutCompanyOverrideFor(Optional withoutCompanyOverride } public Builder withoutCompanyOverrideFor(String withoutCompanyOverrideFor) { - this.withoutCompanyOverrideFor = Optional.of(withoutCompanyOverrideFor); + this.withoutCompanyOverrideFor = Optional.ofNullable(withoutCompanyOverrideFor); return this; } @@ -202,7 +202,7 @@ public Builder withoutPlanEntitlementFor(Optional withoutPlanEntitlement } public Builder withoutPlanEntitlementFor(String withoutPlanEntitlementFor) { - this.withoutPlanEntitlementFor = Optional.of(withoutPlanEntitlementFor); + this.withoutPlanEntitlementFor = Optional.ofNullable(withoutPlanEntitlementFor); return this; } @@ -213,7 +213,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -224,7 +224,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/features/requests/ListFlagsRequest.java b/src/main/java/com/schematic/api/resources/features/requests/ListFlagsRequest.java index 6e76460..6c428c5 100644 --- a/src/main/java/com/schematic/api/resources/features/requests/ListFlagsRequest.java +++ b/src/main/java/com/schematic/api/resources/features/requests/ListFlagsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFlagsRequest.Builder.class) public final class ListFlagsRequest { private final Optional featureId; @@ -144,7 +144,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -155,7 +155,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -166,7 +166,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -177,7 +177,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -188,7 +188,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/features/requests/UpdateFeatureRequestBody.java b/src/main/java/com/schematic/api/resources/features/requests/UpdateFeatureRequestBody.java index 74d75dc..008ea6e 100644 --- a/src/main/java/com/schematic/api/resources/features/requests/UpdateFeatureRequestBody.java +++ b/src/main/java/com/schematic/api/resources/features/requests/UpdateFeatureRequestBody.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateFeatureRequestBody.Builder.class) public final class UpdateFeatureRequestBody { private final Optional description; @@ -201,7 +201,7 @@ public Builder description(Optional description) { } public Builder description(String description) { - this.description = Optional.of(description); + this.description = Optional.ofNullable(description); return this; } @@ -212,7 +212,7 @@ public Builder eventSubtype(Optional eventSubtype) { } public Builder eventSubtype(String eventSubtype) { - this.eventSubtype = Optional.of(eventSubtype); + this.eventSubtype = Optional.ofNullable(eventSubtype); return this; } @@ -223,7 +223,7 @@ public Builder featureType(Optional feature } public Builder featureType(UpdateFeatureRequestBodyFeatureType featureType) { - this.featureType = Optional.of(featureType); + this.featureType = Optional.ofNullable(featureType); return this; } @@ -234,7 +234,7 @@ public Builder flag(Optional flag) { } public Builder flag(CreateOrUpdateFlagRequestBody flag) { - this.flag = Optional.of(flag); + this.flag = Optional.ofNullable(flag); return this; } @@ -245,7 +245,7 @@ public Builder icon(Optional icon) { } public Builder icon(String icon) { - this.icon = Optional.of(icon); + this.icon = Optional.ofNullable(icon); return this; } @@ -256,7 +256,7 @@ public Builder lifecyclePhase(Optional lifecyclePhase) { } public Builder lifecyclePhase(String lifecyclePhase) { - this.lifecyclePhase = Optional.of(lifecyclePhase); + this.lifecyclePhase = Optional.ofNullable(lifecyclePhase); return this; } @@ -267,7 +267,7 @@ public Builder maintainerId(Optional maintainerId) { } public Builder maintainerId(String maintainerId) { - this.maintainerId = Optional.of(maintainerId); + this.maintainerId = Optional.ofNullable(maintainerId); return this; } @@ -278,7 +278,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -289,7 +289,7 @@ public Builder traitId(Optional traitId) { } public Builder traitId(String traitId) { - this.traitId = Optional.of(traitId); + this.traitId = Optional.ofNullable(traitId); return this; } diff --git a/src/main/java/com/schematic/api/resources/features/requests/UpdateFlagRulesRequestBody.java b/src/main/java/com/schematic/api/resources/features/requests/UpdateFlagRulesRequestBody.java index e55d090..d58fd88 100644 --- a/src/main/java/com/schematic/api/resources/features/requests/UpdateFlagRulesRequestBody.java +++ b/src/main/java/com/schematic/api/resources/features/requests/UpdateFlagRulesRequestBody.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateFlagRulesRequestBody.Builder.class) public final class UpdateFlagRulesRequestBody { private final List rules; diff --git a/src/main/java/com/schematic/api/resources/features/types/CheckFlagResponse.java b/src/main/java/com/schematic/api/resources/features/types/CheckFlagResponse.java index 7448873..3c90932 100644 --- a/src/main/java/com/schematic/api/resources/features/types/CheckFlagResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/CheckFlagResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CheckFlagResponse.Builder.class) public final class CheckFlagResponse { private final CheckFlagResponseData data; diff --git a/src/main/java/com/schematic/api/resources/features/types/CheckFlagsResponse.java b/src/main/java/com/schematic/api/resources/features/types/CheckFlagsResponse.java index 36446d6..1e7b045 100644 --- a/src/main/java/com/schematic/api/resources/features/types/CheckFlagsResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/CheckFlagsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CheckFlagsResponse.Builder.class) public final class CheckFlagsResponse { private final CheckFlagsResponseData data; diff --git a/src/main/java/com/schematic/api/resources/features/types/CountAudienceCompaniesResponse.java b/src/main/java/com/schematic/api/resources/features/types/CountAudienceCompaniesResponse.java index de6bcbd..db3802e 100644 --- a/src/main/java/com/schematic/api/resources/features/types/CountAudienceCompaniesResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/CountAudienceCompaniesResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountAudienceCompaniesResponse.Builder.class) public final class CountAudienceCompaniesResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/features/types/CountAudienceUsersResponse.java b/src/main/java/com/schematic/api/resources/features/types/CountAudienceUsersResponse.java index d4d2506..7a9e40a 100644 --- a/src/main/java/com/schematic/api/resources/features/types/CountAudienceUsersResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/CountAudienceUsersResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountAudienceUsersResponse.Builder.class) public final class CountAudienceUsersResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/features/types/CountFeaturesParams.java b/src/main/java/com/schematic/api/resources/features/types/CountFeaturesParams.java index 3cab205..c5ef0ad 100644 --- a/src/main/java/com/schematic/api/resources/features/types/CountFeaturesParams.java +++ b/src/main/java/com/schematic/api/resources/features/types/CountFeaturesParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFeaturesParams.Builder.class) public final class CountFeaturesParams { private final Optional> ids; @@ -170,7 +170,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -181,7 +181,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -192,7 +192,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -203,7 +203,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -214,7 +214,7 @@ public Builder withoutCompanyOverrideFor(Optional withoutCompanyOverride } public Builder withoutCompanyOverrideFor(String withoutCompanyOverrideFor) { - this.withoutCompanyOverrideFor = Optional.of(withoutCompanyOverrideFor); + this.withoutCompanyOverrideFor = Optional.ofNullable(withoutCompanyOverrideFor); return this; } @@ -225,7 +225,7 @@ public Builder withoutPlanEntitlementFor(Optional withoutPlanEntitlement } public Builder withoutPlanEntitlementFor(String withoutPlanEntitlementFor) { - this.withoutPlanEntitlementFor = Optional.of(withoutPlanEntitlementFor); + this.withoutPlanEntitlementFor = Optional.ofNullable(withoutPlanEntitlementFor); return this; } diff --git a/src/main/java/com/schematic/api/resources/features/types/CountFeaturesResponse.java b/src/main/java/com/schematic/api/resources/features/types/CountFeaturesResponse.java index f0bf2b2..bf4abc0 100644 --- a/src/main/java/com/schematic/api/resources/features/types/CountFeaturesResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/CountFeaturesResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFeaturesResponse.Builder.class) public final class CountFeaturesResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/features/types/CountFlagsParams.java b/src/main/java/com/schematic/api/resources/features/types/CountFlagsParams.java index 482a42f..d4905f1 100644 --- a/src/main/java/com/schematic/api/resources/features/types/CountFlagsParams.java +++ b/src/main/java/com/schematic/api/resources/features/types/CountFlagsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFlagsParams.Builder.class) public final class CountFlagsParams { private final Optional featureId; @@ -145,7 +145,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -156,7 +156,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -167,7 +167,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -178,7 +178,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -189,7 +189,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/features/types/CountFlagsResponse.java b/src/main/java/com/schematic/api/resources/features/types/CountFlagsResponse.java index d817418..66bd4b5 100644 --- a/src/main/java/com/schematic/api/resources/features/types/CountFlagsResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/CountFlagsResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountFlagsResponse.Builder.class) public final class CountFlagsResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/features/types/CreateFeatureResponse.java b/src/main/java/com/schematic/api/resources/features/types/CreateFeatureResponse.java index 07fadad..70583f3 100644 --- a/src/main/java/com/schematic/api/resources/features/types/CreateFeatureResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/CreateFeatureResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateFeatureResponse.Builder.class) public final class CreateFeatureResponse { private final FeatureDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/features/types/CreateFlagResponse.java b/src/main/java/com/schematic/api/resources/features/types/CreateFlagResponse.java index 535bb57..9204679 100644 --- a/src/main/java/com/schematic/api/resources/features/types/CreateFlagResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/CreateFlagResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateFlagResponse.Builder.class) public final class CreateFlagResponse { private final FlagDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/features/types/DeleteFeatureResponse.java b/src/main/java/com/schematic/api/resources/features/types/DeleteFeatureResponse.java index e97b623..bbb12bb 100644 --- a/src/main/java/com/schematic/api/resources/features/types/DeleteFeatureResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/DeleteFeatureResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteFeatureResponse.Builder.class) public final class DeleteFeatureResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/features/types/DeleteFlagResponse.java b/src/main/java/com/schematic/api/resources/features/types/DeleteFlagResponse.java index ae480b5..8008e21 100644 --- a/src/main/java/com/schematic/api/resources/features/types/DeleteFlagResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/DeleteFlagResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteFlagResponse.Builder.class) public final class DeleteFlagResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/features/types/GetFeatureResponse.java b/src/main/java/com/schematic/api/resources/features/types/GetFeatureResponse.java index f1189c8..1c1449c 100644 --- a/src/main/java/com/schematic/api/resources/features/types/GetFeatureResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/GetFeatureResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetFeatureResponse.Builder.class) public final class GetFeatureResponse { private final FeatureDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/features/types/GetFlagResponse.java b/src/main/java/com/schematic/api/resources/features/types/GetFlagResponse.java index e718a6e..ef0910f 100644 --- a/src/main/java/com/schematic/api/resources/features/types/GetFlagResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/GetFlagResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetFlagResponse.Builder.class) public final class GetFlagResponse { private final FlagDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/features/types/ListAudienceCompaniesResponse.java b/src/main/java/com/schematic/api/resources/features/types/ListAudienceCompaniesResponse.java index 7f7bb4b..54fa25f 100644 --- a/src/main/java/com/schematic/api/resources/features/types/ListAudienceCompaniesResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/ListAudienceCompaniesResponse.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListAudienceCompaniesResponse.Builder.class) public final class ListAudienceCompaniesResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/features/types/ListAudienceUsersResponse.java b/src/main/java/com/schematic/api/resources/features/types/ListAudienceUsersResponse.java index 92dbacd..f95e4a7 100644 --- a/src/main/java/com/schematic/api/resources/features/types/ListAudienceUsersResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/ListAudienceUsersResponse.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListAudienceUsersResponse.Builder.class) public final class ListAudienceUsersResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/features/types/ListFeaturesParams.java b/src/main/java/com/schematic/api/resources/features/types/ListFeaturesParams.java index 37b5f1a..5cc2229 100644 --- a/src/main/java/com/schematic/api/resources/features/types/ListFeaturesParams.java +++ b/src/main/java/com/schematic/api/resources/features/types/ListFeaturesParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFeaturesParams.Builder.class) public final class ListFeaturesParams { private final Optional> ids; @@ -170,7 +170,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -181,7 +181,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -192,7 +192,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -203,7 +203,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -214,7 +214,7 @@ public Builder withoutCompanyOverrideFor(Optional withoutCompanyOverride } public Builder withoutCompanyOverrideFor(String withoutCompanyOverrideFor) { - this.withoutCompanyOverrideFor = Optional.of(withoutCompanyOverrideFor); + this.withoutCompanyOverrideFor = Optional.ofNullable(withoutCompanyOverrideFor); return this; } @@ -225,7 +225,7 @@ public Builder withoutPlanEntitlementFor(Optional withoutPlanEntitlement } public Builder withoutPlanEntitlementFor(String withoutPlanEntitlementFor) { - this.withoutPlanEntitlementFor = Optional.of(withoutPlanEntitlementFor); + this.withoutPlanEntitlementFor = Optional.ofNullable(withoutPlanEntitlementFor); return this; } diff --git a/src/main/java/com/schematic/api/resources/features/types/ListFeaturesResponse.java b/src/main/java/com/schematic/api/resources/features/types/ListFeaturesResponse.java index 6955b61..7d4d877 100644 --- a/src/main/java/com/schematic/api/resources/features/types/ListFeaturesResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/ListFeaturesResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFeaturesResponse.Builder.class) public final class ListFeaturesResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/features/types/ListFlagsParams.java b/src/main/java/com/schematic/api/resources/features/types/ListFlagsParams.java index 8cc114d..b69ca81 100644 --- a/src/main/java/com/schematic/api/resources/features/types/ListFlagsParams.java +++ b/src/main/java/com/schematic/api/resources/features/types/ListFlagsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFlagsParams.Builder.class) public final class ListFlagsParams { private final Optional featureId; @@ -145,7 +145,7 @@ public Builder featureId(Optional featureId) { } public Builder featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -156,7 +156,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -167,7 +167,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -178,7 +178,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -189,7 +189,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/features/types/ListFlagsResponse.java b/src/main/java/com/schematic/api/resources/features/types/ListFlagsResponse.java index 7531ed2..4acb0a6 100644 --- a/src/main/java/com/schematic/api/resources/features/types/ListFlagsResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/ListFlagsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListFlagsResponse.Builder.class) public final class ListFlagsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/features/types/UpdateFeatureResponse.java b/src/main/java/com/schematic/api/resources/features/types/UpdateFeatureResponse.java index 44428ee..1922979 100644 --- a/src/main/java/com/schematic/api/resources/features/types/UpdateFeatureResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/UpdateFeatureResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateFeatureResponse.Builder.class) public final class UpdateFeatureResponse { private final FeatureDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/features/types/UpdateFlagResponse.java b/src/main/java/com/schematic/api/resources/features/types/UpdateFlagResponse.java index dae2cf3..8584e33 100644 --- a/src/main/java/com/schematic/api/resources/features/types/UpdateFlagResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/UpdateFlagResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateFlagResponse.Builder.class) public final class UpdateFlagResponse { private final FlagDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/features/types/UpdateFlagRulesResponse.java b/src/main/java/com/schematic/api/resources/features/types/UpdateFlagRulesResponse.java index 1fd6c37..d578f33 100644 --- a/src/main/java/com/schematic/api/resources/features/types/UpdateFlagRulesResponse.java +++ b/src/main/java/com/schematic/api/resources/features/types/UpdateFlagRulesResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateFlagRulesResponse.Builder.class) public final class UpdateFlagRulesResponse { private final RulesDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/plangroups/requests/CreatePlanGroupRequestBody.java b/src/main/java/com/schematic/api/resources/plangroups/requests/CreatePlanGroupRequestBody.java index 1477dfc..723b344 100644 --- a/src/main/java/com/schematic/api/resources/plangroups/requests/CreatePlanGroupRequestBody.java +++ b/src/main/java/com/schematic/api/resources/plangroups/requests/CreatePlanGroupRequestBody.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreatePlanGroupRequestBody.Builder.class) public final class CreatePlanGroupRequestBody { private final List addOnIds; @@ -158,7 +158,7 @@ public Builder defaultPlanId(Optional defaultPlanId) { } public Builder defaultPlanId(String defaultPlanId) { - this.defaultPlanId = Optional.of(defaultPlanId); + this.defaultPlanId = Optional.ofNullable(defaultPlanId); return this; } @@ -186,7 +186,7 @@ public Builder trialDays(Optional trialDays) { } public Builder trialDays(Integer trialDays) { - this.trialDays = Optional.of(trialDays); + this.trialDays = Optional.ofNullable(trialDays); return this; } @@ -197,7 +197,7 @@ public Builder trialPaymentMethodRequired(Optional trialPaymentMethodRe } public Builder trialPaymentMethodRequired(Boolean trialPaymentMethodRequired) { - this.trialPaymentMethodRequired = Optional.of(trialPaymentMethodRequired); + this.trialPaymentMethodRequired = Optional.ofNullable(trialPaymentMethodRequired); return this; } diff --git a/src/main/java/com/schematic/api/resources/plangroups/requests/UpdatePlanGroupRequestBody.java b/src/main/java/com/schematic/api/resources/plangroups/requests/UpdatePlanGroupRequestBody.java index a54946b..2651db5 100644 --- a/src/main/java/com/schematic/api/resources/plangroups/requests/UpdatePlanGroupRequestBody.java +++ b/src/main/java/com/schematic/api/resources/plangroups/requests/UpdatePlanGroupRequestBody.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdatePlanGroupRequestBody.Builder.class) public final class UpdatePlanGroupRequestBody { private final List addOnIds; @@ -158,7 +158,7 @@ public Builder defaultPlanId(Optional defaultPlanId) { } public Builder defaultPlanId(String defaultPlanId) { - this.defaultPlanId = Optional.of(defaultPlanId); + this.defaultPlanId = Optional.ofNullable(defaultPlanId); return this; } @@ -186,7 +186,7 @@ public Builder trialDays(Optional trialDays) { } public Builder trialDays(Integer trialDays) { - this.trialDays = Optional.of(trialDays); + this.trialDays = Optional.ofNullable(trialDays); return this; } @@ -197,7 +197,7 @@ public Builder trialPaymentMethodRequired(Optional trialPaymentMethodRe } public Builder trialPaymentMethodRequired(Boolean trialPaymentMethodRequired) { - this.trialPaymentMethodRequired = Optional.of(trialPaymentMethodRequired); + this.trialPaymentMethodRequired = Optional.ofNullable(trialPaymentMethodRequired); return this; } diff --git a/src/main/java/com/schematic/api/resources/plangroups/types/CreatePlanGroupResponse.java b/src/main/java/com/schematic/api/resources/plangroups/types/CreatePlanGroupResponse.java index 1298137..abb896f 100644 --- a/src/main/java/com/schematic/api/resources/plangroups/types/CreatePlanGroupResponse.java +++ b/src/main/java/com/schematic/api/resources/plangroups/types/CreatePlanGroupResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreatePlanGroupResponse.Builder.class) public final class CreatePlanGroupResponse { private final PlanGroupResponseData data; diff --git a/src/main/java/com/schematic/api/resources/plangroups/types/GetPlanGroupResponse.java b/src/main/java/com/schematic/api/resources/plangroups/types/GetPlanGroupResponse.java index 2cd4ee8..25a4d94 100644 --- a/src/main/java/com/schematic/api/resources/plangroups/types/GetPlanGroupResponse.java +++ b/src/main/java/com/schematic/api/resources/plangroups/types/GetPlanGroupResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetPlanGroupResponse.Builder.class) public final class GetPlanGroupResponse { private final PlanGroupDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/plangroups/types/UpdatePlanGroupResponse.java b/src/main/java/com/schematic/api/resources/plangroups/types/UpdatePlanGroupResponse.java index ca9e07c..54ed3c4 100644 --- a/src/main/java/com/schematic/api/resources/plangroups/types/UpdatePlanGroupResponse.java +++ b/src/main/java/com/schematic/api/resources/plangroups/types/UpdatePlanGroupResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdatePlanGroupResponse.Builder.class) public final class UpdatePlanGroupResponse { private final PlanGroupResponseData data; diff --git a/src/main/java/com/schematic/api/resources/plans/requests/CountPlansRequest.java b/src/main/java/com/schematic/api/resources/plans/requests/CountPlansRequest.java index 265e5b5..dfd6418 100644 --- a/src/main/java/com/schematic/api/resources/plans/requests/CountPlansRequest.java +++ b/src/main/java/com/schematic/api/resources/plans/requests/CountPlansRequest.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountPlansRequest.Builder.class) public final class CountPlansRequest { private final Optional companyId; @@ -218,7 +218,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -229,7 +229,7 @@ public Builder hasProductId(Optional hasProductId) { } public Builder hasProductId(Boolean hasProductId) { - this.hasProductId = Optional.of(hasProductId); + this.hasProductId = Optional.ofNullable(hasProductId); return this; } @@ -240,7 +240,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -251,7 +251,7 @@ public Builder planType(Optional planType) { } public Builder planType(CountPlansRequestPlanType planType) { - this.planType = Optional.of(planType); + this.planType = Optional.ofNullable(planType); return this; } @@ -262,7 +262,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -273,7 +273,7 @@ public Builder withoutEntitlementFor(Optional withoutEntitlementFor) { } public Builder withoutEntitlementFor(String withoutEntitlementFor) { - this.withoutEntitlementFor = Optional.of(withoutEntitlementFor); + this.withoutEntitlementFor = Optional.ofNullable(withoutEntitlementFor); return this; } @@ -284,7 +284,7 @@ public Builder withoutProductId(Optional withoutProductId) { } public Builder withoutProductId(Boolean withoutProductId) { - this.withoutProductId = Optional.of(withoutProductId); + this.withoutProductId = Optional.ofNullable(withoutProductId); return this; } @@ -295,7 +295,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -306,7 +306,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/plans/requests/CreatePlanRequestBody.java b/src/main/java/com/schematic/api/resources/plans/requests/CreatePlanRequestBody.java index f02c6e4..f75284e 100644 --- a/src/main/java/com/schematic/api/resources/plans/requests/CreatePlanRequestBody.java +++ b/src/main/java/com/schematic/api/resources/plans/requests/CreatePlanRequestBody.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreatePlanRequestBody.Builder.class) public final class CreatePlanRequestBody { private final String description; @@ -165,7 +165,7 @@ public _FinalStage planType(CreatePlanRequestBodyPlanType planType) { @java.lang.Override public _FinalStage icon(String icon) { - this.icon = Optional.of(icon); + this.icon = Optional.ofNullable(icon); return this; } diff --git a/src/main/java/com/schematic/api/resources/plans/requests/ListPlansRequest.java b/src/main/java/com/schematic/api/resources/plans/requests/ListPlansRequest.java index 941bcda..cc4b8e3 100644 --- a/src/main/java/com/schematic/api/resources/plans/requests/ListPlansRequest.java +++ b/src/main/java/com/schematic/api/resources/plans/requests/ListPlansRequest.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListPlansRequest.Builder.class) public final class ListPlansRequest { private final Optional companyId; @@ -218,7 +218,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -229,7 +229,7 @@ public Builder hasProductId(Optional hasProductId) { } public Builder hasProductId(Boolean hasProductId) { - this.hasProductId = Optional.of(hasProductId); + this.hasProductId = Optional.ofNullable(hasProductId); return this; } @@ -240,7 +240,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -251,7 +251,7 @@ public Builder planType(Optional planType) { } public Builder planType(ListPlansRequestPlanType planType) { - this.planType = Optional.of(planType); + this.planType = Optional.ofNullable(planType); return this; } @@ -262,7 +262,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -273,7 +273,7 @@ public Builder withoutEntitlementFor(Optional withoutEntitlementFor) { } public Builder withoutEntitlementFor(String withoutEntitlementFor) { - this.withoutEntitlementFor = Optional.of(withoutEntitlementFor); + this.withoutEntitlementFor = Optional.ofNullable(withoutEntitlementFor); return this; } @@ -284,7 +284,7 @@ public Builder withoutProductId(Optional withoutProductId) { } public Builder withoutProductId(Boolean withoutProductId) { - this.withoutProductId = Optional.of(withoutProductId); + this.withoutProductId = Optional.ofNullable(withoutProductId); return this; } @@ -295,7 +295,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -306,7 +306,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/plans/requests/UpdateAudienceRequestBody.java b/src/main/java/com/schematic/api/resources/plans/requests/UpdateAudienceRequestBody.java index 430e881..bd08550 100644 --- a/src/main/java/com/schematic/api/resources/plans/requests/UpdateAudienceRequestBody.java +++ b/src/main/java/com/schematic/api/resources/plans/requests/UpdateAudienceRequestBody.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateAudienceRequestBody.Builder.class) public final class UpdateAudienceRequestBody { private final List conditionGroups; diff --git a/src/main/java/com/schematic/api/resources/plans/requests/UpdatePlanRequestBody.java b/src/main/java/com/schematic/api/resources/plans/requests/UpdatePlanRequestBody.java index 108efad..addcddb 100644 --- a/src/main/java/com/schematic/api/resources/plans/requests/UpdatePlanRequestBody.java +++ b/src/main/java/com/schematic/api/resources/plans/requests/UpdatePlanRequestBody.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdatePlanRequestBody.Builder.class) public final class UpdatePlanRequestBody { private final Optional description; @@ -131,7 +131,7 @@ public _FinalStage name(String name) { @java.lang.Override public _FinalStage icon(String icon) { - this.icon = Optional.of(icon); + this.icon = Optional.ofNullable(icon); return this; } @@ -144,7 +144,7 @@ public _FinalStage icon(Optional icon) { @java.lang.Override public _FinalStage description(String description) { - this.description = Optional.of(description); + this.description = Optional.ofNullable(description); return this; } diff --git a/src/main/java/com/schematic/api/resources/plans/requests/UpsertBillingProductRequestBody.java b/src/main/java/com/schematic/api/resources/plans/requests/UpsertBillingProductRequestBody.java index dbc6c00..8926824 100644 --- a/src/main/java/com/schematic/api/resources/plans/requests/UpsertBillingProductRequestBody.java +++ b/src/main/java/com/schematic/api/resources/plans/requests/UpsertBillingProductRequestBody.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertBillingProductRequestBody.Builder.class) public final class UpsertBillingProductRequestBody { private final Optional billingProductId; @@ -197,7 +197,7 @@ public _FinalStage isTrialable(boolean isTrialable) { @java.lang.Override public _FinalStage yearlyPriceId(String yearlyPriceId) { - this.yearlyPriceId = Optional.of(yearlyPriceId); + this.yearlyPriceId = Optional.ofNullable(yearlyPriceId); return this; } @@ -210,7 +210,7 @@ public _FinalStage yearlyPriceId(Optional yearlyPriceId) { @java.lang.Override public _FinalStage trialDays(Integer trialDays) { - this.trialDays = Optional.of(trialDays); + this.trialDays = Optional.ofNullable(trialDays); return this; } @@ -223,7 +223,7 @@ public _FinalStage trialDays(Optional trialDays) { @java.lang.Override public _FinalStage monthlyPriceId(String monthlyPriceId) { - this.monthlyPriceId = Optional.of(monthlyPriceId); + this.monthlyPriceId = Optional.ofNullable(monthlyPriceId); return this; } @@ -236,7 +236,7 @@ public _FinalStage monthlyPriceId(Optional monthlyPriceId) { @java.lang.Override public _FinalStage billingProductId(String billingProductId) { - this.billingProductId = Optional.of(billingProductId); + this.billingProductId = Optional.ofNullable(billingProductId); return this; } diff --git a/src/main/java/com/schematic/api/resources/plans/types/CountPlansParams.java b/src/main/java/com/schematic/api/resources/plans/types/CountPlansParams.java index ad67f43..eda8e7a 100644 --- a/src/main/java/com/schematic/api/resources/plans/types/CountPlansParams.java +++ b/src/main/java/com/schematic/api/resources/plans/types/CountPlansParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountPlansParams.Builder.class) public final class CountPlansParams { private final Optional companyId; @@ -218,7 +218,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -229,7 +229,7 @@ public Builder hasProductId(Optional hasProductId) { } public Builder hasProductId(Boolean hasProductId) { - this.hasProductId = Optional.of(hasProductId); + this.hasProductId = Optional.ofNullable(hasProductId); return this; } @@ -240,7 +240,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -251,7 +251,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -262,7 +262,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -273,7 +273,7 @@ public Builder planType(Optional planType) { } public Builder planType(CountPlansResponseParamsPlanType planType) { - this.planType = Optional.of(planType); + this.planType = Optional.ofNullable(planType); return this; } @@ -284,7 +284,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -295,7 +295,7 @@ public Builder withoutEntitlementFor(Optional withoutEntitlementFor) { } public Builder withoutEntitlementFor(String withoutEntitlementFor) { - this.withoutEntitlementFor = Optional.of(withoutEntitlementFor); + this.withoutEntitlementFor = Optional.ofNullable(withoutEntitlementFor); return this; } @@ -306,7 +306,7 @@ public Builder withoutProductId(Optional withoutProductId) { } public Builder withoutProductId(Boolean withoutProductId) { - this.withoutProductId = Optional.of(withoutProductId); + this.withoutProductId = Optional.ofNullable(withoutProductId); return this; } diff --git a/src/main/java/com/schematic/api/resources/plans/types/CountPlansResponse.java b/src/main/java/com/schematic/api/resources/plans/types/CountPlansResponse.java index 4942574..d37eb18 100644 --- a/src/main/java/com/schematic/api/resources/plans/types/CountPlansResponse.java +++ b/src/main/java/com/schematic/api/resources/plans/types/CountPlansResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountPlansResponse.Builder.class) public final class CountPlansResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/plans/types/CreatePlanResponse.java b/src/main/java/com/schematic/api/resources/plans/types/CreatePlanResponse.java index 0a8c335..c82d6fa 100644 --- a/src/main/java/com/schematic/api/resources/plans/types/CreatePlanResponse.java +++ b/src/main/java/com/schematic/api/resources/plans/types/CreatePlanResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreatePlanResponse.Builder.class) public final class CreatePlanResponse { private final PlanDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/plans/types/DeleteAudienceResponse.java b/src/main/java/com/schematic/api/resources/plans/types/DeleteAudienceResponse.java index 1b90e2f..5e09fbc 100644 --- a/src/main/java/com/schematic/api/resources/plans/types/DeleteAudienceResponse.java +++ b/src/main/java/com/schematic/api/resources/plans/types/DeleteAudienceResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteAudienceResponse.Builder.class) public final class DeleteAudienceResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/plans/types/DeletePlanResponse.java b/src/main/java/com/schematic/api/resources/plans/types/DeletePlanResponse.java index 9444e98..9c5ef73 100644 --- a/src/main/java/com/schematic/api/resources/plans/types/DeletePlanResponse.java +++ b/src/main/java/com/schematic/api/resources/plans/types/DeletePlanResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeletePlanResponse.Builder.class) public final class DeletePlanResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/plans/types/GetAudienceResponse.java b/src/main/java/com/schematic/api/resources/plans/types/GetAudienceResponse.java index b102489..26bc94d 100644 --- a/src/main/java/com/schematic/api/resources/plans/types/GetAudienceResponse.java +++ b/src/main/java/com/schematic/api/resources/plans/types/GetAudienceResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetAudienceResponse.Builder.class) public final class GetAudienceResponse { private final PlanAudienceDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/plans/types/GetPlanResponse.java b/src/main/java/com/schematic/api/resources/plans/types/GetPlanResponse.java index 828b4e1..35bcfa8 100644 --- a/src/main/java/com/schematic/api/resources/plans/types/GetPlanResponse.java +++ b/src/main/java/com/schematic/api/resources/plans/types/GetPlanResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetPlanResponse.Builder.class) public final class GetPlanResponse { private final PlanDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/plans/types/ListPlansParams.java b/src/main/java/com/schematic/api/resources/plans/types/ListPlansParams.java index da33520..bc898a0 100644 --- a/src/main/java/com/schematic/api/resources/plans/types/ListPlansParams.java +++ b/src/main/java/com/schematic/api/resources/plans/types/ListPlansParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListPlansParams.Builder.class) public final class ListPlansParams { private final Optional companyId; @@ -218,7 +218,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -229,7 +229,7 @@ public Builder hasProductId(Optional hasProductId) { } public Builder hasProductId(Boolean hasProductId) { - this.hasProductId = Optional.of(hasProductId); + this.hasProductId = Optional.ofNullable(hasProductId); return this; } @@ -240,7 +240,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -251,7 +251,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -262,7 +262,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -273,7 +273,7 @@ public Builder planType(Optional planType) { } public Builder planType(ListPlansResponseParamsPlanType planType) { - this.planType = Optional.of(planType); + this.planType = Optional.ofNullable(planType); return this; } @@ -284,7 +284,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -295,7 +295,7 @@ public Builder withoutEntitlementFor(Optional withoutEntitlementFor) { } public Builder withoutEntitlementFor(String withoutEntitlementFor) { - this.withoutEntitlementFor = Optional.of(withoutEntitlementFor); + this.withoutEntitlementFor = Optional.ofNullable(withoutEntitlementFor); return this; } @@ -306,7 +306,7 @@ public Builder withoutProductId(Optional withoutProductId) { } public Builder withoutProductId(Boolean withoutProductId) { - this.withoutProductId = Optional.of(withoutProductId); + this.withoutProductId = Optional.ofNullable(withoutProductId); return this; } diff --git a/src/main/java/com/schematic/api/resources/plans/types/ListPlansResponse.java b/src/main/java/com/schematic/api/resources/plans/types/ListPlansResponse.java index 5e48a11..c382db5 100644 --- a/src/main/java/com/schematic/api/resources/plans/types/ListPlansResponse.java +++ b/src/main/java/com/schematic/api/resources/plans/types/ListPlansResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListPlansResponse.Builder.class) public final class ListPlansResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/plans/types/UpdateAudienceResponse.java b/src/main/java/com/schematic/api/resources/plans/types/UpdateAudienceResponse.java index 3fcdd64..1339e33 100644 --- a/src/main/java/com/schematic/api/resources/plans/types/UpdateAudienceResponse.java +++ b/src/main/java/com/schematic/api/resources/plans/types/UpdateAudienceResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateAudienceResponse.Builder.class) public final class UpdateAudienceResponse { private final PlanAudienceDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/plans/types/UpdatePlanResponse.java b/src/main/java/com/schematic/api/resources/plans/types/UpdatePlanResponse.java index 02da236..f37a5d0 100644 --- a/src/main/java/com/schematic/api/resources/plans/types/UpdatePlanResponse.java +++ b/src/main/java/com/schematic/api/resources/plans/types/UpdatePlanResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdatePlanResponse.Builder.class) public final class UpdatePlanResponse { private final PlanDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/plans/types/UpsertBillingProductPlanResponse.java b/src/main/java/com/schematic/api/resources/plans/types/UpsertBillingProductPlanResponse.java index 9ce2a99..0fbd536 100644 --- a/src/main/java/com/schematic/api/resources/plans/types/UpsertBillingProductPlanResponse.java +++ b/src/main/java/com/schematic/api/resources/plans/types/UpsertBillingProductPlanResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertBillingProductPlanResponse.Builder.class) public final class UpsertBillingProductPlanResponse { private final BillingProductPlanResponseData data; diff --git a/src/main/java/com/schematic/api/resources/webhooks/requests/CountWebhookEventsRequest.java b/src/main/java/com/schematic/api/resources/webhooks/requests/CountWebhookEventsRequest.java index 3ebe145..ec41ae0 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/requests/CountWebhookEventsRequest.java +++ b/src/main/java/com/schematic/api/resources/webhooks/requests/CountWebhookEventsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountWebhookEventsRequest.Builder.class) public final class CountWebhookEventsRequest { private final Optional ids; @@ -144,7 +144,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -155,7 +155,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -166,7 +166,7 @@ public Builder webhookId(Optional webhookId) { } public Builder webhookId(String webhookId) { - this.webhookId = Optional.of(webhookId); + this.webhookId = Optional.ofNullable(webhookId); return this; } @@ -177,7 +177,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -188,7 +188,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/webhooks/requests/CountWebhooksRequest.java b/src/main/java/com/schematic/api/resources/webhooks/requests/CountWebhooksRequest.java index dd01d13..0726cbf 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/requests/CountWebhooksRequest.java +++ b/src/main/java/com/schematic/api/resources/webhooks/requests/CountWebhooksRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountWebhooksRequest.Builder.class) public final class CountWebhooksRequest { private final Optional q; @@ -116,7 +116,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -127,7 +127,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -138,7 +138,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/webhooks/requests/CreateWebhookRequestBody.java b/src/main/java/com/schematic/api/resources/webhooks/requests/CreateWebhookRequestBody.java index 10e2f77..67470cc 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/requests/CreateWebhookRequestBody.java +++ b/src/main/java/com/schematic/api/resources/webhooks/requests/CreateWebhookRequestBody.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateWebhookRequestBody.Builder.class) public final class CreateWebhookRequestBody { private final String name; diff --git a/src/main/java/com/schematic/api/resources/webhooks/requests/ListWebhookEventsRequest.java b/src/main/java/com/schematic/api/resources/webhooks/requests/ListWebhookEventsRequest.java index 7dfc05c..83527d0 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/requests/ListWebhookEventsRequest.java +++ b/src/main/java/com/schematic/api/resources/webhooks/requests/ListWebhookEventsRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListWebhookEventsRequest.Builder.class) public final class ListWebhookEventsRequest { private final Optional ids; @@ -144,7 +144,7 @@ public Builder ids(Optional ids) { } public Builder ids(String ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -155,7 +155,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -166,7 +166,7 @@ public Builder webhookId(Optional webhookId) { } public Builder webhookId(String webhookId) { - this.webhookId = Optional.of(webhookId); + this.webhookId = Optional.ofNullable(webhookId); return this; } @@ -177,7 +177,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -188,7 +188,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/webhooks/requests/ListWebhooksRequest.java b/src/main/java/com/schematic/api/resources/webhooks/requests/ListWebhooksRequest.java index 9712a51..4276071 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/requests/ListWebhooksRequest.java +++ b/src/main/java/com/schematic/api/resources/webhooks/requests/ListWebhooksRequest.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListWebhooksRequest.Builder.class) public final class ListWebhooksRequest { private final Optional q; @@ -116,7 +116,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -127,7 +127,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -138,7 +138,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/resources/webhooks/requests/UpdateWebhookRequestBody.java b/src/main/java/com/schematic/api/resources/webhooks/requests/UpdateWebhookRequestBody.java index 24e3d6b..68846e5 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/requests/UpdateWebhookRequestBody.java +++ b/src/main/java/com/schematic/api/resources/webhooks/requests/UpdateWebhookRequestBody.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateWebhookRequestBody.Builder.class) public final class UpdateWebhookRequestBody { private final Optional name; @@ -128,7 +128,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -139,7 +139,7 @@ public Builder requestTypes(Optional requestTypes) { - this.requestTypes = Optional.of(requestTypes); + this.requestTypes = Optional.ofNullable(requestTypes); return this; } @@ -150,7 +150,7 @@ public Builder status(Optional status) { } public Builder status(UpdateWebhookRequestBodyStatus status) { - this.status = Optional.of(status); + this.status = Optional.ofNullable(status); return this; } @@ -161,7 +161,7 @@ public Builder url(Optional url) { } public Builder url(String url) { - this.url = Optional.of(url); + this.url = Optional.ofNullable(url); return this; } diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhookEventsParams.java b/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhookEventsParams.java index b2f5a8d..06d7132 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhookEventsParams.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhookEventsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountWebhookEventsParams.Builder.class) public final class CountWebhookEventsParams { private final Optional> ids; @@ -145,7 +145,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -156,7 +156,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -167,7 +167,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -178,7 +178,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -189,7 +189,7 @@ public Builder webhookId(Optional webhookId) { } public Builder webhookId(String webhookId) { - this.webhookId = Optional.of(webhookId); + this.webhookId = Optional.ofNullable(webhookId); return this; } diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhookEventsResponse.java b/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhookEventsResponse.java index b43e968..95f2ea3 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhookEventsResponse.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhookEventsResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountWebhookEventsResponse.Builder.class) public final class CountWebhookEventsResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhooksParams.java b/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhooksParams.java index e51fa56..29f2e53 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhooksParams.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhooksParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountWebhooksParams.Builder.class) public final class CountWebhooksParams { private final Optional limit; @@ -116,7 +116,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -127,7 +127,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -138,7 +138,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhooksResponse.java b/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhooksResponse.java index b6b64d5..3b377b8 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhooksResponse.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/CountWebhooksResponse.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountWebhooksResponse.Builder.class) public final class CountWebhooksResponse { private final CountResponse data; diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/CreateWebhookResponse.java b/src/main/java/com/schematic/api/resources/webhooks/types/CreateWebhookResponse.java index 6688b4f..4a878bd 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/CreateWebhookResponse.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/CreateWebhookResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateWebhookResponse.Builder.class) public final class CreateWebhookResponse { private final WebhookResponseData data; diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/DeleteWebhookResponse.java b/src/main/java/com/schematic/api/resources/webhooks/types/DeleteWebhookResponse.java index 093aaf6..9ebf0a9 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/DeleteWebhookResponse.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/DeleteWebhookResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteWebhookResponse.Builder.class) public final class DeleteWebhookResponse { private final DeleteResponse data; diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/GetWebhookEventResponse.java b/src/main/java/com/schematic/api/resources/webhooks/types/GetWebhookEventResponse.java index 89899ac..c243e58 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/GetWebhookEventResponse.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/GetWebhookEventResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetWebhookEventResponse.Builder.class) public final class GetWebhookEventResponse { private final WebhookEventDetailResponseData data; diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/GetWebhookResponse.java b/src/main/java/com/schematic/api/resources/webhooks/types/GetWebhookResponse.java index 61b8f0f..db9c4c8 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/GetWebhookResponse.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/GetWebhookResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GetWebhookResponse.Builder.class) public final class GetWebhookResponse { private final WebhookResponseData data; diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhookEventsParams.java b/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhookEventsParams.java index 0dc172a..6a4e368 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhookEventsParams.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhookEventsParams.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListWebhookEventsParams.Builder.class) public final class ListWebhookEventsParams { private final Optional> ids; @@ -145,7 +145,7 @@ public Builder ids(Optional> ids) { } public Builder ids(List ids) { - this.ids = Optional.of(ids); + this.ids = Optional.ofNullable(ids); return this; } @@ -156,7 +156,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -167,7 +167,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -178,7 +178,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } @@ -189,7 +189,7 @@ public Builder webhookId(Optional webhookId) { } public Builder webhookId(String webhookId) { - this.webhookId = Optional.of(webhookId); + this.webhookId = Optional.ofNullable(webhookId); return this; } diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhookEventsResponse.java b/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhookEventsResponse.java index 51a3c31..79176f1 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhookEventsResponse.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhookEventsResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListWebhookEventsResponse.Builder.class) public final class ListWebhookEventsResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhooksParams.java b/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhooksParams.java index 051165f..0b1b0c6 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhooksParams.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhooksParams.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListWebhooksParams.Builder.class) public final class ListWebhooksParams { private final Optional limit; @@ -116,7 +116,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -127,7 +127,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -138,7 +138,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhooksResponse.java b/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhooksResponse.java index 47b8ba6..f86c472 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhooksResponse.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/ListWebhooksResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ListWebhooksResponse.Builder.class) public final class ListWebhooksResponse { private final List data; diff --git a/src/main/java/com/schematic/api/resources/webhooks/types/UpdateWebhookResponse.java b/src/main/java/com/schematic/api/resources/webhooks/types/UpdateWebhookResponse.java index 30d8eaa..6314bb1 100644 --- a/src/main/java/com/schematic/api/resources/webhooks/types/UpdateWebhookResponse.java +++ b/src/main/java/com/schematic/api/resources/webhooks/types/UpdateWebhookResponse.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateWebhookResponse.Builder.class) public final class UpdateWebhookResponse { private final WebhookResponseData data; diff --git a/src/main/java/com/schematic/api/types/ApiError.java b/src/main/java/com/schematic/api/types/ApiError.java index f4a9187..5d17d52 100644 --- a/src/main/java/com/schematic/api/types/ApiError.java +++ b/src/main/java/com/schematic/api/types/ApiError.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ApiError.Builder.class) public final class ApiError { private final String error; diff --git a/src/main/java/com/schematic/api/types/ApiKeyCreateResponseData.java b/src/main/java/com/schematic/api/types/ApiKeyCreateResponseData.java index e5d126b..ba098c9 100644 --- a/src/main/java/com/schematic/api/types/ApiKeyCreateResponseData.java +++ b/src/main/java/com/schematic/api/types/ApiKeyCreateResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ApiKeyCreateResponseData.Builder.class) public final class ApiKeyCreateResponseData { private final OffsetDateTime createdAt; @@ -298,7 +298,7 @@ public _FinalStage scopes(List scopes) { @java.lang.Override public _FinalStage lastUsedAt(OffsetDateTime lastUsedAt) { - this.lastUsedAt = Optional.of(lastUsedAt); + this.lastUsedAt = Optional.ofNullable(lastUsedAt); return this; } @@ -311,7 +311,7 @@ public _FinalStage lastUsedAt(Optional lastUsedAt) { @java.lang.Override public _FinalStage environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -324,7 +324,7 @@ public _FinalStage environmentId(Optional environmentId) { @java.lang.Override public _FinalStage description(String description) { - this.description = Optional.of(description); + this.description = Optional.ofNullable(description); return this; } diff --git a/src/main/java/com/schematic/api/types/ApiKeyRequestListResponseData.java b/src/main/java/com/schematic/api/types/ApiKeyRequestListResponseData.java index c3a724d..4ec0490 100644 --- a/src/main/java/com/schematic/api/types/ApiKeyRequestListResponseData.java +++ b/src/main/java/com/schematic/api/types/ApiKeyRequestListResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ApiKeyRequestListResponseData.Builder.class) public final class ApiKeyRequestListResponseData { private final String apiKeyId; @@ -400,7 +400,7 @@ public _FinalStage url(String url) { @java.lang.Override public _FinalStage userName(String userName) { - this.userName = Optional.of(userName); + this.userName = Optional.ofNullable(userName); return this; } @@ -413,7 +413,7 @@ public _FinalStage userName(Optional userName) { @java.lang.Override public _FinalStage secondaryResource(String secondaryResource) { - this.secondaryResource = Optional.of(secondaryResource); + this.secondaryResource = Optional.ofNullable(secondaryResource); return this; } @@ -426,7 +426,7 @@ public _FinalStage secondaryResource(Optional secondaryResource) { @java.lang.Override public _FinalStage respCode(Integer respCode) { - this.respCode = Optional.of(respCode); + this.respCode = Optional.ofNullable(respCode); return this; } @@ -439,7 +439,7 @@ public _FinalStage respCode(Optional respCode) { @java.lang.Override public _FinalStage resourceType(String resourceType) { - this.resourceType = Optional.of(resourceType); + this.resourceType = Optional.ofNullable(resourceType); return this; } @@ -452,7 +452,7 @@ public _FinalStage resourceType(Optional resourceType) { @java.lang.Override public _FinalStage resourceName(String resourceName) { - this.resourceName = Optional.of(resourceName); + this.resourceName = Optional.ofNullable(resourceName); return this; } @@ -465,7 +465,7 @@ public _FinalStage resourceName(Optional resourceName) { @java.lang.Override public _FinalStage resourceIdString(String resourceIdString) { - this.resourceIdString = Optional.of(resourceIdString); + this.resourceIdString = Optional.ofNullable(resourceIdString); return this; } @@ -478,7 +478,7 @@ public _FinalStage resourceIdString(Optional resourceIdString) { @java.lang.Override public _FinalStage resourceId(Integer resourceId) { - this.resourceId = Optional.of(resourceId); + this.resourceId = Optional.ofNullable(resourceId); return this; } @@ -491,7 +491,7 @@ public _FinalStage resourceId(Optional resourceId) { @java.lang.Override public _FinalStage requestType(String requestType) { - this.requestType = Optional.of(requestType); + this.requestType = Optional.ofNullable(requestType); return this; } @@ -504,7 +504,7 @@ public _FinalStage requestType(Optional requestType) { @java.lang.Override public _FinalStage reqBody(String reqBody) { - this.reqBody = Optional.of(reqBody); + this.reqBody = Optional.ofNullable(reqBody); return this; } @@ -517,7 +517,7 @@ public _FinalStage reqBody(Optional reqBody) { @java.lang.Override public _FinalStage environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -530,7 +530,7 @@ public _FinalStage environmentId(Optional environmentId) { @java.lang.Override public _FinalStage endedAt(OffsetDateTime endedAt) { - this.endedAt = Optional.of(endedAt); + this.endedAt = Optional.ofNullable(endedAt); return this; } diff --git a/src/main/java/com/schematic/api/types/ApiKeyRequestResponseData.java b/src/main/java/com/schematic/api/types/ApiKeyRequestResponseData.java index 152bb7d..4b75220 100644 --- a/src/main/java/com/schematic/api/types/ApiKeyRequestResponseData.java +++ b/src/main/java/com/schematic/api/types/ApiKeyRequestResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ApiKeyRequestResponseData.Builder.class) public final class ApiKeyRequestResponseData { private final String apiKeyId; @@ -454,7 +454,7 @@ public _FinalStage url(String url) { @java.lang.Override public _FinalStage userName(String userName) { - this.userName = Optional.of(userName); + this.userName = Optional.ofNullable(userName); return this; } @@ -467,7 +467,7 @@ public _FinalStage userName(Optional userName) { @java.lang.Override public _FinalStage userId(String userId) { - this.userId = Optional.of(userId); + this.userId = Optional.ofNullable(userId); return this; } @@ -480,7 +480,7 @@ public _FinalStage userId(Optional userId) { @java.lang.Override public _FinalStage userAgent(String userAgent) { - this.userAgent = Optional.of(userAgent); + this.userAgent = Optional.ofNullable(userAgent); return this; } @@ -493,7 +493,7 @@ public _FinalStage userAgent(Optional userAgent) { @java.lang.Override public _FinalStage secondaryResource(String secondaryResource) { - this.secondaryResource = Optional.of(secondaryResource); + this.secondaryResource = Optional.ofNullable(secondaryResource); return this; } @@ -506,7 +506,7 @@ public _FinalStage secondaryResource(Optional secondaryResource) { @java.lang.Override public _FinalStage respCode(Integer respCode) { - this.respCode = Optional.of(respCode); + this.respCode = Optional.ofNullable(respCode); return this; } @@ -519,7 +519,7 @@ public _FinalStage respCode(Optional respCode) { @java.lang.Override public _FinalStage respBody(String respBody) { - this.respBody = Optional.of(respBody); + this.respBody = Optional.ofNullable(respBody); return this; } @@ -532,7 +532,7 @@ public _FinalStage respBody(Optional respBody) { @java.lang.Override public _FinalStage resourceType(String resourceType) { - this.resourceType = Optional.of(resourceType); + this.resourceType = Optional.ofNullable(resourceType); return this; } @@ -545,7 +545,7 @@ public _FinalStage resourceType(Optional resourceType) { @java.lang.Override public _FinalStage resourceName(String resourceName) { - this.resourceName = Optional.of(resourceName); + this.resourceName = Optional.ofNullable(resourceName); return this; } @@ -558,7 +558,7 @@ public _FinalStage resourceName(Optional resourceName) { @java.lang.Override public _FinalStage resourceIdString(String resourceIdString) { - this.resourceIdString = Optional.of(resourceIdString); + this.resourceIdString = Optional.ofNullable(resourceIdString); return this; } @@ -571,7 +571,7 @@ public _FinalStage resourceIdString(Optional resourceIdString) { @java.lang.Override public _FinalStage resourceId(Integer resourceId) { - this.resourceId = Optional.of(resourceId); + this.resourceId = Optional.ofNullable(resourceId); return this; } @@ -584,7 +584,7 @@ public _FinalStage resourceId(Optional resourceId) { @java.lang.Override public _FinalStage requestType(String requestType) { - this.requestType = Optional.of(requestType); + this.requestType = Optional.ofNullable(requestType); return this; } @@ -597,7 +597,7 @@ public _FinalStage requestType(Optional requestType) { @java.lang.Override public _FinalStage reqBody(String reqBody) { - this.reqBody = Optional.of(reqBody); + this.reqBody = Optional.ofNullable(reqBody); return this; } @@ -610,7 +610,7 @@ public _FinalStage reqBody(Optional reqBody) { @java.lang.Override public _FinalStage environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -623,7 +623,7 @@ public _FinalStage environmentId(Optional environmentId) { @java.lang.Override public _FinalStage endedAt(OffsetDateTime endedAt) { - this.endedAt = Optional.of(endedAt); + this.endedAt = Optional.ofNullable(endedAt); return this; } diff --git a/src/main/java/com/schematic/api/types/ApiKeyResponseData.java b/src/main/java/com/schematic/api/types/ApiKeyResponseData.java index 8eab34a..6d307b9 100644 --- a/src/main/java/com/schematic/api/types/ApiKeyResponseData.java +++ b/src/main/java/com/schematic/api/types/ApiKeyResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ApiKeyResponseData.Builder.class) public final class ApiKeyResponseData { private final OffsetDateTime createdAt; @@ -272,7 +272,7 @@ public _FinalStage scopes(List scopes) { @java.lang.Override public _FinalStage lastUsedAt(OffsetDateTime lastUsedAt) { - this.lastUsedAt = Optional.of(lastUsedAt); + this.lastUsedAt = Optional.ofNullable(lastUsedAt); return this; } @@ -285,7 +285,7 @@ public _FinalStage lastUsedAt(Optional lastUsedAt) { @java.lang.Override public _FinalStage environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -298,7 +298,7 @@ public _FinalStage environmentId(Optional environmentId) { @java.lang.Override public _FinalStage description(String description) { - this.description = Optional.of(description); + this.description = Optional.ofNullable(description); return this; } diff --git a/src/main/java/com/schematic/api/types/AudienceRequestBody.java b/src/main/java/com/schematic/api/types/AudienceRequestBody.java index b53fd34..1fc2e76 100644 --- a/src/main/java/com/schematic/api/types/AudienceRequestBody.java +++ b/src/main/java/com/schematic/api/types/AudienceRequestBody.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = AudienceRequestBody.Builder.class) public final class AudienceRequestBody { private final List conditionGroups; @@ -180,7 +180,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -191,7 +191,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } @@ -202,7 +202,7 @@ public Builder q(Optional q) { } public Builder q(String q) { - this.q = Optional.of(q); + this.q = Optional.ofNullable(q); return this; } diff --git a/src/main/java/com/schematic/api/types/BillingCouponResponseData.java b/src/main/java/com/schematic/api/types/BillingCouponResponseData.java new file mode 100644 index 0000000..bcfa1ac --- /dev/null +++ b/src/main/java/com/schematic/api/types/BillingCouponResponseData.java @@ -0,0 +1,572 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = BillingCouponResponseData.Builder.class) +public final class BillingCouponResponseData { + private final String accountId; + + private final Optional amountOff; + + private final Optional currency; + + private final Optional duration; + + private final Optional durationInMonths; + + private final String environmentId; + + private final String externalId; + + private final String id; + + private final boolean isActive; + + private final Optional maxRedemptions; + + private final Map metadata; + + private final String name; + + private final Optional percentOff; + + private final int timesRedeemed; + + private final Optional validFrom; + + private final Optional validUntil; + + private final Map additionalProperties; + + private BillingCouponResponseData( + String accountId, + Optional amountOff, + Optional currency, + Optional duration, + Optional durationInMonths, + String environmentId, + String externalId, + String id, + boolean isActive, + Optional maxRedemptions, + Map metadata, + String name, + Optional percentOff, + int timesRedeemed, + Optional validFrom, + Optional validUntil, + Map additionalProperties) { + this.accountId = accountId; + this.amountOff = amountOff; + this.currency = currency; + this.duration = duration; + this.durationInMonths = durationInMonths; + this.environmentId = environmentId; + this.externalId = externalId; + this.id = id; + this.isActive = isActive; + this.maxRedemptions = maxRedemptions; + this.metadata = metadata; + this.name = name; + this.percentOff = percentOff; + this.timesRedeemed = timesRedeemed; + this.validFrom = validFrom; + this.validUntil = validUntil; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("account_id") + public String getAccountId() { + return accountId; + } + + @JsonProperty("amount_off") + public Optional getAmountOff() { + return amountOff; + } + + @JsonProperty("currency") + public Optional getCurrency() { + return currency; + } + + @JsonProperty("duration") + public Optional getDuration() { + return duration; + } + + @JsonProperty("duration_in_months") + public Optional getDurationInMonths() { + return durationInMonths; + } + + @JsonProperty("environment_id") + public String getEnvironmentId() { + return environmentId; + } + + @JsonProperty("external_id") + public String getExternalId() { + return externalId; + } + + @JsonProperty("id") + public String getId() { + return id; + } + + @JsonProperty("is_active") + public boolean getIsActive() { + return isActive; + } + + @JsonProperty("max_redemptions") + public Optional getMaxRedemptions() { + return maxRedemptions; + } + + @JsonProperty("metadata") + public Map getMetadata() { + return metadata; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("percent_off") + public Optional getPercentOff() { + return percentOff; + } + + @JsonProperty("times_redeemed") + public int getTimesRedeemed() { + return timesRedeemed; + } + + @JsonProperty("valid_from") + public Optional getValidFrom() { + return validFrom; + } + + @JsonProperty("valid_until") + public Optional getValidUntil() { + return validUntil; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof BillingCouponResponseData && equalTo((BillingCouponResponseData) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(BillingCouponResponseData other) { + return accountId.equals(other.accountId) + && amountOff.equals(other.amountOff) + && currency.equals(other.currency) + && duration.equals(other.duration) + && durationInMonths.equals(other.durationInMonths) + && environmentId.equals(other.environmentId) + && externalId.equals(other.externalId) + && id.equals(other.id) + && isActive == other.isActive + && maxRedemptions.equals(other.maxRedemptions) + && metadata.equals(other.metadata) + && name.equals(other.name) + && percentOff.equals(other.percentOff) + && timesRedeemed == other.timesRedeemed + && validFrom.equals(other.validFrom) + && validUntil.equals(other.validUntil); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash( + this.accountId, + this.amountOff, + this.currency, + this.duration, + this.durationInMonths, + this.environmentId, + this.externalId, + this.id, + this.isActive, + this.maxRedemptions, + this.metadata, + this.name, + this.percentOff, + this.timesRedeemed, + this.validFrom, + this.validUntil); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static AccountIdStage builder() { + return new Builder(); + } + + public interface AccountIdStage { + EnvironmentIdStage accountId(String accountId); + + Builder from(BillingCouponResponseData other); + } + + public interface EnvironmentIdStage { + ExternalIdStage environmentId(String environmentId); + } + + public interface ExternalIdStage { + IdStage externalId(String externalId); + } + + public interface IdStage { + IsActiveStage id(String id); + } + + public interface IsActiveStage { + NameStage isActive(boolean isActive); + } + + public interface NameStage { + TimesRedeemedStage name(String name); + } + + public interface TimesRedeemedStage { + _FinalStage timesRedeemed(int timesRedeemed); + } + + public interface _FinalStage { + BillingCouponResponseData build(); + + _FinalStage amountOff(Optional amountOff); + + _FinalStage amountOff(Integer amountOff); + + _FinalStage currency(Optional currency); + + _FinalStage currency(String currency); + + _FinalStage duration(Optional duration); + + _FinalStage duration(String duration); + + _FinalStage durationInMonths(Optional durationInMonths); + + _FinalStage durationInMonths(Integer durationInMonths); + + _FinalStage maxRedemptions(Optional maxRedemptions); + + _FinalStage maxRedemptions(Integer maxRedemptions); + + _FinalStage metadata(Map metadata); + + _FinalStage putAllMetadata(Map metadata); + + _FinalStage metadata(String key, JsonNode value); + + _FinalStage percentOff(Optional percentOff); + + _FinalStage percentOff(Integer percentOff); + + _FinalStage validFrom(Optional validFrom); + + _FinalStage validFrom(OffsetDateTime validFrom); + + _FinalStage validUntil(Optional validUntil); + + _FinalStage validUntil(OffsetDateTime validUntil); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder + implements AccountIdStage, + EnvironmentIdStage, + ExternalIdStage, + IdStage, + IsActiveStage, + NameStage, + TimesRedeemedStage, + _FinalStage { + private String accountId; + + private String environmentId; + + private String externalId; + + private String id; + + private boolean isActive; + + private String name; + + private int timesRedeemed; + + private Optional validUntil = Optional.empty(); + + private Optional validFrom = Optional.empty(); + + private Optional percentOff = Optional.empty(); + + private Map metadata = new LinkedHashMap<>(); + + private Optional maxRedemptions = Optional.empty(); + + private Optional durationInMonths = Optional.empty(); + + private Optional duration = Optional.empty(); + + private Optional currency = Optional.empty(); + + private Optional amountOff = Optional.empty(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(BillingCouponResponseData other) { + accountId(other.getAccountId()); + amountOff(other.getAmountOff()); + currency(other.getCurrency()); + duration(other.getDuration()); + durationInMonths(other.getDurationInMonths()); + environmentId(other.getEnvironmentId()); + externalId(other.getExternalId()); + id(other.getId()); + isActive(other.getIsActive()); + maxRedemptions(other.getMaxRedemptions()); + metadata(other.getMetadata()); + name(other.getName()); + percentOff(other.getPercentOff()); + timesRedeemed(other.getTimesRedeemed()); + validFrom(other.getValidFrom()); + validUntil(other.getValidUntil()); + return this; + } + + @java.lang.Override + @JsonSetter("account_id") + public EnvironmentIdStage accountId(String accountId) { + this.accountId = accountId; + return this; + } + + @java.lang.Override + @JsonSetter("environment_id") + public ExternalIdStage environmentId(String environmentId) { + this.environmentId = environmentId; + return this; + } + + @java.lang.Override + @JsonSetter("external_id") + public IdStage externalId(String externalId) { + this.externalId = externalId; + return this; + } + + @java.lang.Override + @JsonSetter("id") + public IsActiveStage id(String id) { + this.id = id; + return this; + } + + @java.lang.Override + @JsonSetter("is_active") + public NameStage isActive(boolean isActive) { + this.isActive = isActive; + return this; + } + + @java.lang.Override + @JsonSetter("name") + public TimesRedeemedStage name(String name) { + this.name = name; + return this; + } + + @java.lang.Override + @JsonSetter("times_redeemed") + public _FinalStage timesRedeemed(int timesRedeemed) { + this.timesRedeemed = timesRedeemed; + return this; + } + + @java.lang.Override + public _FinalStage validUntil(OffsetDateTime validUntil) { + this.validUntil = Optional.ofNullable(validUntil); + return this; + } + + @java.lang.Override + @JsonSetter(value = "valid_until", nulls = Nulls.SKIP) + public _FinalStage validUntil(Optional validUntil) { + this.validUntil = validUntil; + return this; + } + + @java.lang.Override + public _FinalStage validFrom(OffsetDateTime validFrom) { + this.validFrom = Optional.ofNullable(validFrom); + return this; + } + + @java.lang.Override + @JsonSetter(value = "valid_from", nulls = Nulls.SKIP) + public _FinalStage validFrom(Optional validFrom) { + this.validFrom = validFrom; + return this; + } + + @java.lang.Override + public _FinalStage percentOff(Integer percentOff) { + this.percentOff = Optional.ofNullable(percentOff); + return this; + } + + @java.lang.Override + @JsonSetter(value = "percent_off", nulls = Nulls.SKIP) + public _FinalStage percentOff(Optional percentOff) { + this.percentOff = percentOff; + return this; + } + + @java.lang.Override + public _FinalStage metadata(String key, JsonNode value) { + this.metadata.put(key, value); + return this; + } + + @java.lang.Override + public _FinalStage putAllMetadata(Map metadata) { + this.metadata.putAll(metadata); + return this; + } + + @java.lang.Override + @JsonSetter(value = "metadata", nulls = Nulls.SKIP) + public _FinalStage metadata(Map metadata) { + this.metadata.clear(); + this.metadata.putAll(metadata); + return this; + } + + @java.lang.Override + public _FinalStage maxRedemptions(Integer maxRedemptions) { + this.maxRedemptions = Optional.ofNullable(maxRedemptions); + return this; + } + + @java.lang.Override + @JsonSetter(value = "max_redemptions", nulls = Nulls.SKIP) + public _FinalStage maxRedemptions(Optional maxRedemptions) { + this.maxRedemptions = maxRedemptions; + return this; + } + + @java.lang.Override + public _FinalStage durationInMonths(Integer durationInMonths) { + this.durationInMonths = Optional.ofNullable(durationInMonths); + return this; + } + + @java.lang.Override + @JsonSetter(value = "duration_in_months", nulls = Nulls.SKIP) + public _FinalStage durationInMonths(Optional durationInMonths) { + this.durationInMonths = durationInMonths; + return this; + } + + @java.lang.Override + public _FinalStage duration(String duration) { + this.duration = Optional.ofNullable(duration); + return this; + } + + @java.lang.Override + @JsonSetter(value = "duration", nulls = Nulls.SKIP) + public _FinalStage duration(Optional duration) { + this.duration = duration; + return this; + } + + @java.lang.Override + public _FinalStage currency(String currency) { + this.currency = Optional.ofNullable(currency); + return this; + } + + @java.lang.Override + @JsonSetter(value = "currency", nulls = Nulls.SKIP) + public _FinalStage currency(Optional currency) { + this.currency = currency; + return this; + } + + @java.lang.Override + public _FinalStage amountOff(Integer amountOff) { + this.amountOff = Optional.ofNullable(amountOff); + return this; + } + + @java.lang.Override + @JsonSetter(value = "amount_off", nulls = Nulls.SKIP) + public _FinalStage amountOff(Optional amountOff) { + this.amountOff = amountOff; + return this; + } + + @java.lang.Override + public BillingCouponResponseData build() { + return new BillingCouponResponseData( + accountId, + amountOff, + currency, + duration, + durationInMonths, + environmentId, + externalId, + id, + isActive, + maxRedemptions, + metadata, + name, + percentOff, + timesRedeemed, + validFrom, + validUntil, + additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/types/BillingCustomerResponseData.java b/src/main/java/com/schematic/api/types/BillingCustomerResponseData.java index a537306..54d7484 100644 --- a/src/main/java/com/schematic/api/types/BillingCustomerResponseData.java +++ b/src/main/java/com/schematic/api/types/BillingCustomerResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingCustomerResponseData.Builder.class) public final class BillingCustomerResponseData { private final Optional companyId; @@ -269,7 +269,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage deletedAt(OffsetDateTime deletedAt) { - this.deletedAt = Optional.of(deletedAt); + this.deletedAt = Optional.ofNullable(deletedAt); return this; } @@ -282,7 +282,7 @@ public _FinalStage deletedAt(Optional deletedAt) { @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } diff --git a/src/main/java/com/schematic/api/types/BillingCustomerSubscription.java b/src/main/java/com/schematic/api/types/BillingCustomerSubscription.java index 2105a7f..6e6684e 100644 --- a/src/main/java/com/schematic/api/types/BillingCustomerSubscription.java +++ b/src/main/java/com/schematic/api/types/BillingCustomerSubscription.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingCustomerSubscription.Builder.class) public final class BillingCustomerSubscription { private final String currency; @@ -220,7 +220,7 @@ public _FinalStage totalPrice(int totalPrice) { @java.lang.Override public _FinalStage expiredAt(OffsetDateTime expiredAt) { - this.expiredAt = Optional.of(expiredAt); + this.expiredAt = Optional.ofNullable(expiredAt); return this; } diff --git a/src/main/java/com/schematic/api/types/BillingCustomerWithSubscriptionsResponseData.java b/src/main/java/com/schematic/api/types/BillingCustomerWithSubscriptionsResponseData.java index 59f48be..d152232 100644 --- a/src/main/java/com/schematic/api/types/BillingCustomerWithSubscriptionsResponseData.java +++ b/src/main/java/com/schematic/api/types/BillingCustomerWithSubscriptionsResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingCustomerWithSubscriptionsResponseData.Builder.class) public final class BillingCustomerWithSubscriptionsResponseData { private final Optional companyId; @@ -312,7 +312,7 @@ public _FinalStage subscriptions(List subscriptions @java.lang.Override public _FinalStage deletedAt(OffsetDateTime deletedAt) { - this.deletedAt = Optional.of(deletedAt); + this.deletedAt = Optional.ofNullable(deletedAt); return this; } @@ -325,7 +325,7 @@ public _FinalStage deletedAt(Optional deletedAt) { @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } diff --git a/src/main/java/com/schematic/api/types/BillingMeterResponseData.java b/src/main/java/com/schematic/api/types/BillingMeterResponseData.java index f19d0be..61e01ca 100644 --- a/src/main/java/com/schematic/api/types/BillingMeterResponseData.java +++ b/src/main/java/com/schematic/api/types/BillingMeterResponseData.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingMeterResponseData.Builder.class) public final class BillingMeterResponseData { private final String dispalyName; diff --git a/src/main/java/com/schematic/api/types/BillingPriceResponseData.java b/src/main/java/com/schematic/api/types/BillingPriceResponseData.java index ae82752..f8074be 100644 --- a/src/main/java/com/schematic/api/types/BillingPriceResponseData.java +++ b/src/main/java/com/schematic/api/types/BillingPriceResponseData.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingPriceResponseData.Builder.class) public final class BillingPriceResponseData { private final String currency; diff --git a/src/main/java/com/schematic/api/types/BillingPriceView.java b/src/main/java/com/schematic/api/types/BillingPriceView.java index dc98b7e..4f5f9e0 100644 --- a/src/main/java/com/schematic/api/types/BillingPriceView.java +++ b/src/main/java/com/schematic/api/types/BillingPriceView.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingPriceView.Builder.class) public final class BillingPriceView { private final OffsetDateTime createdAt; @@ -407,7 +407,7 @@ public _FinalStage usageType(String usageType) { @java.lang.Override public _FinalStage meterId(String meterId) { - this.meterId = Optional.of(meterId); + this.meterId = Optional.ofNullable(meterId); return this; } diff --git a/src/main/java/com/schematic/api/types/BillingProductDetailResponseData.java b/src/main/java/com/schematic/api/types/BillingProductDetailResponseData.java index bda9f45..55b7ec1 100644 --- a/src/main/java/com/schematic/api/types/BillingProductDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/BillingProductDetailResponseData.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingProductDetailResponseData.Builder.class) public final class BillingProductDetailResponseData { private final String accountId; diff --git a/src/main/java/com/schematic/api/types/BillingProductForSubscriptionResponseData.java b/src/main/java/com/schematic/api/types/BillingProductForSubscriptionResponseData.java index 9f0f312..eff8539 100644 --- a/src/main/java/com/schematic/api/types/BillingProductForSubscriptionResponseData.java +++ b/src/main/java/com/schematic/api/types/BillingProductForSubscriptionResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingProductForSubscriptionResponseData.Builder.class) public final class BillingProductForSubscriptionResponseData { private final OffsetDateTime createdAt; @@ -41,6 +41,8 @@ public final class BillingProductForSubscriptionResponseData { private final String priceExternalId; + private final String priceId; + private final double quantity; private final String subscriptionId; @@ -62,6 +64,7 @@ private BillingProductForSubscriptionResponseData( String name, int price, String priceExternalId, + String priceId, double quantity, String subscriptionId, OffsetDateTime updatedAt, @@ -77,6 +80,7 @@ private BillingProductForSubscriptionResponseData( this.name = name; this.price = price; this.priceExternalId = priceExternalId; + this.priceId = priceId; this.quantity = quantity; this.subscriptionId = subscriptionId; this.updatedAt = updatedAt; @@ -134,6 +138,11 @@ public String getPriceExternalId() { return priceExternalId; } + @JsonProperty("price_id") + public String getPriceId() { + return priceId; + } + @JsonProperty("quantity") public double getQuantity() { return quantity; @@ -177,6 +186,7 @@ private boolean equalTo(BillingProductForSubscriptionResponseData other) { && name.equals(other.name) && price == other.price && priceExternalId.equals(other.priceExternalId) + && priceId.equals(other.priceId) && quantity == other.quantity && subscriptionId.equals(other.subscriptionId) && updatedAt.equals(other.updatedAt) @@ -196,6 +206,7 @@ public int hashCode() { this.name, this.price, this.priceExternalId, + this.priceId, this.quantity, this.subscriptionId, this.updatedAt, @@ -246,7 +257,11 @@ public interface PriceStage { } public interface PriceExternalIdStage { - QuantityStage priceExternalId(String priceExternalId); + PriceIdStage priceExternalId(String priceExternalId); + } + + public interface PriceIdStage { + QuantityStage priceId(String priceId); } public interface QuantityStage { @@ -284,6 +299,7 @@ public static final class Builder NameStage, PriceStage, PriceExternalIdStage, + PriceIdStage, QuantityStage, SubscriptionIdStage, UpdatedAtStage, @@ -307,6 +323,8 @@ public static final class Builder private String priceExternalId; + private String priceId; + private double quantity; private String subscriptionId; @@ -334,6 +352,7 @@ public Builder from(BillingProductForSubscriptionResponseData other) { name(other.getName()); price(other.getPrice()); priceExternalId(other.getPriceExternalId()); + priceId(other.getPriceId()); quantity(other.getQuantity()); subscriptionId(other.getSubscriptionId()); updatedAt(other.getUpdatedAt()); @@ -399,11 +418,18 @@ public PriceExternalIdStage price(int price) { @java.lang.Override @JsonSetter("price_external_id") - public QuantityStage priceExternalId(String priceExternalId) { + public PriceIdStage priceExternalId(String priceExternalId) { this.priceExternalId = priceExternalId; return this; } + @java.lang.Override + @JsonSetter("price_id") + public QuantityStage priceId(String priceId) { + this.priceId = priceId; + return this; + } + @java.lang.Override @JsonSetter("quantity") public SubscriptionIdStage quantity(double quantity) { @@ -434,7 +460,7 @@ public _FinalStage usageType(String usageType) { @java.lang.Override public _FinalStage meterId(String meterId) { - this.meterId = Optional.of(meterId); + this.meterId = Optional.ofNullable(meterId); return this; } @@ -458,6 +484,7 @@ public BillingProductForSubscriptionResponseData build() { name, price, priceExternalId, + priceId, quantity, subscriptionId, updatedAt, diff --git a/src/main/java/com/schematic/api/types/BillingProductPlanResponseData.java b/src/main/java/com/schematic/api/types/BillingProductPlanResponseData.java index 0cc8436..ac2f51a 100644 --- a/src/main/java/com/schematic/api/types/BillingProductPlanResponseData.java +++ b/src/main/java/com/schematic/api/types/BillingProductPlanResponseData.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingProductPlanResponseData.Builder.class) public final class BillingProductPlanResponseData { private final String accountId; @@ -260,7 +260,7 @@ public _FinalStage planId(String planId) { @java.lang.Override public _FinalStage yearlyPriceId(String yearlyPriceId) { - this.yearlyPriceId = Optional.of(yearlyPriceId); + this.yearlyPriceId = Optional.ofNullable(yearlyPriceId); return this; } @@ -273,7 +273,7 @@ public _FinalStage yearlyPriceId(Optional yearlyPriceId) { @java.lang.Override public _FinalStage trialDays(Integer trialDays) { - this.trialDays = Optional.of(trialDays); + this.trialDays = Optional.ofNullable(trialDays); return this; } @@ -286,7 +286,7 @@ public _FinalStage trialDays(Optional trialDays) { @java.lang.Override public _FinalStage monthlyPriceId(String monthlyPriceId) { - this.monthlyPriceId = Optional.of(monthlyPriceId); + this.monthlyPriceId = Optional.ofNullable(monthlyPriceId); return this; } diff --git a/src/main/java/com/schematic/api/types/BillingProductPriceResponseData.java b/src/main/java/com/schematic/api/types/BillingProductPriceResponseData.java index d1dea50..ee3e4dd 100644 --- a/src/main/java/com/schematic/api/types/BillingProductPriceResponseData.java +++ b/src/main/java/com/schematic/api/types/BillingProductPriceResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingProductPriceResponseData.Builder.class) public final class BillingProductPriceResponseData { private final OffsetDateTime createdAt; @@ -329,7 +329,7 @@ public _FinalStage usageType(String usageType) { @java.lang.Override public _FinalStage meterId(String meterId) { - this.meterId = Optional.of(meterId); + this.meterId = Optional.ofNullable(meterId); return this; } diff --git a/src/main/java/com/schematic/api/types/BillingProductPricing.java b/src/main/java/com/schematic/api/types/BillingProductPricing.java index ca9c956..707f3e9 100644 --- a/src/main/java/com/schematic/api/types/BillingProductPricing.java +++ b/src/main/java/com/schematic/api/types/BillingProductPricing.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingProductPricing.Builder.class) public final class BillingProductPricing { private final String currency; @@ -276,7 +276,7 @@ public _FinalStage usageType(String usageType) { @java.lang.Override public _FinalStage meterId(String meterId) { - this.meterId = Optional.of(meterId); + this.meterId = Optional.ofNullable(meterId); return this; } diff --git a/src/main/java/com/schematic/api/types/BillingProductResponseData.java b/src/main/java/com/schematic/api/types/BillingProductResponseData.java index c36552f..16364d9 100644 --- a/src/main/java/com/schematic/api/types/BillingProductResponseData.java +++ b/src/main/java/com/schematic/api/types/BillingProductResponseData.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingProductResponseData.Builder.class) public final class BillingProductResponseData { private final String accountId; diff --git a/src/main/java/com/schematic/api/types/BillingSubscriptionDiscount.java b/src/main/java/com/schematic/api/types/BillingSubscriptionDiscount.java new file mode 100644 index 0000000..0918305 --- /dev/null +++ b/src/main/java/com/schematic/api/types/BillingSubscriptionDiscount.java @@ -0,0 +1,284 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = BillingSubscriptionDiscount.Builder.class) +public final class BillingSubscriptionDiscount { + private final String couponExternalId; + + private final Optional customerFacingCode; + + private final Optional endedAt; + + private final String externalId; + + private final boolean isActive; + + private final Optional promoCodeExternalId; + + private final OffsetDateTime startedAt; + + private final Map additionalProperties; + + private BillingSubscriptionDiscount( + String couponExternalId, + Optional customerFacingCode, + Optional endedAt, + String externalId, + boolean isActive, + Optional promoCodeExternalId, + OffsetDateTime startedAt, + Map additionalProperties) { + this.couponExternalId = couponExternalId; + this.customerFacingCode = customerFacingCode; + this.endedAt = endedAt; + this.externalId = externalId; + this.isActive = isActive; + this.promoCodeExternalId = promoCodeExternalId; + this.startedAt = startedAt; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("coupon_external_id") + public String getCouponExternalId() { + return couponExternalId; + } + + @JsonProperty("customer_facing_code") + public Optional getCustomerFacingCode() { + return customerFacingCode; + } + + @JsonProperty("ended_at") + public Optional getEndedAt() { + return endedAt; + } + + @JsonProperty("external_id") + public String getExternalId() { + return externalId; + } + + @JsonProperty("is_active") + public boolean getIsActive() { + return isActive; + } + + @JsonProperty("promo_code_external_id") + public Optional getPromoCodeExternalId() { + return promoCodeExternalId; + } + + @JsonProperty("started_at") + public OffsetDateTime getStartedAt() { + return startedAt; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof BillingSubscriptionDiscount && equalTo((BillingSubscriptionDiscount) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(BillingSubscriptionDiscount other) { + return couponExternalId.equals(other.couponExternalId) + && customerFacingCode.equals(other.customerFacingCode) + && endedAt.equals(other.endedAt) + && externalId.equals(other.externalId) + && isActive == other.isActive + && promoCodeExternalId.equals(other.promoCodeExternalId) + && startedAt.equals(other.startedAt); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash( + this.couponExternalId, + this.customerFacingCode, + this.endedAt, + this.externalId, + this.isActive, + this.promoCodeExternalId, + this.startedAt); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static CouponExternalIdStage builder() { + return new Builder(); + } + + public interface CouponExternalIdStage { + ExternalIdStage couponExternalId(String couponExternalId); + + Builder from(BillingSubscriptionDiscount other); + } + + public interface ExternalIdStage { + IsActiveStage externalId(String externalId); + } + + public interface IsActiveStage { + StartedAtStage isActive(boolean isActive); + } + + public interface StartedAtStage { + _FinalStage startedAt(OffsetDateTime startedAt); + } + + public interface _FinalStage { + BillingSubscriptionDiscount build(); + + _FinalStage customerFacingCode(Optional customerFacingCode); + + _FinalStage customerFacingCode(String customerFacingCode); + + _FinalStage endedAt(Optional endedAt); + + _FinalStage endedAt(OffsetDateTime endedAt); + + _FinalStage promoCodeExternalId(Optional promoCodeExternalId); + + _FinalStage promoCodeExternalId(String promoCodeExternalId); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder + implements CouponExternalIdStage, ExternalIdStage, IsActiveStage, StartedAtStage, _FinalStage { + private String couponExternalId; + + private String externalId; + + private boolean isActive; + + private OffsetDateTime startedAt; + + private Optional promoCodeExternalId = Optional.empty(); + + private Optional endedAt = Optional.empty(); + + private Optional customerFacingCode = Optional.empty(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(BillingSubscriptionDiscount other) { + couponExternalId(other.getCouponExternalId()); + customerFacingCode(other.getCustomerFacingCode()); + endedAt(other.getEndedAt()); + externalId(other.getExternalId()); + isActive(other.getIsActive()); + promoCodeExternalId(other.getPromoCodeExternalId()); + startedAt(other.getStartedAt()); + return this; + } + + @java.lang.Override + @JsonSetter("coupon_external_id") + public ExternalIdStage couponExternalId(String couponExternalId) { + this.couponExternalId = couponExternalId; + return this; + } + + @java.lang.Override + @JsonSetter("external_id") + public IsActiveStage externalId(String externalId) { + this.externalId = externalId; + return this; + } + + @java.lang.Override + @JsonSetter("is_active") + public StartedAtStage isActive(boolean isActive) { + this.isActive = isActive; + return this; + } + + @java.lang.Override + @JsonSetter("started_at") + public _FinalStage startedAt(OffsetDateTime startedAt) { + this.startedAt = startedAt; + return this; + } + + @java.lang.Override + public _FinalStage promoCodeExternalId(String promoCodeExternalId) { + this.promoCodeExternalId = Optional.ofNullable(promoCodeExternalId); + return this; + } + + @java.lang.Override + @JsonSetter(value = "promo_code_external_id", nulls = Nulls.SKIP) + public _FinalStage promoCodeExternalId(Optional promoCodeExternalId) { + this.promoCodeExternalId = promoCodeExternalId; + return this; + } + + @java.lang.Override + public _FinalStage endedAt(OffsetDateTime endedAt) { + this.endedAt = Optional.ofNullable(endedAt); + return this; + } + + @java.lang.Override + @JsonSetter(value = "ended_at", nulls = Nulls.SKIP) + public _FinalStage endedAt(Optional endedAt) { + this.endedAt = endedAt; + return this; + } + + @java.lang.Override + public _FinalStage customerFacingCode(String customerFacingCode) { + this.customerFacingCode = Optional.ofNullable(customerFacingCode); + return this; + } + + @java.lang.Override + @JsonSetter(value = "customer_facing_code", nulls = Nulls.SKIP) + public _FinalStage customerFacingCode(Optional customerFacingCode) { + this.customerFacingCode = customerFacingCode; + return this; + } + + @java.lang.Override + public BillingSubscriptionDiscount build() { + return new BillingSubscriptionDiscount( + couponExternalId, + customerFacingCode, + endedAt, + externalId, + isActive, + promoCodeExternalId, + startedAt, + additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/types/BillingSubscriptionDiscountView.java b/src/main/java/com/schematic/api/types/BillingSubscriptionDiscountView.java new file mode 100644 index 0000000..d4205e8 --- /dev/null +++ b/src/main/java/com/schematic/api/types/BillingSubscriptionDiscountView.java @@ -0,0 +1,497 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = BillingSubscriptionDiscountView.Builder.class) +public final class BillingSubscriptionDiscountView { + private final Optional amountOff; + + private final String couponId; + + private final String couponName; + + private final Optional currency; + + private final Optional customerFacingCode; + + private final String discountExternalId; + + private final String duration; + + private final Optional durationInMonths; + + private final Optional endedAt; + + private final boolean isActive; + + private final Optional percentOff; + + private final Optional promoCodeExternalId; + + private final OffsetDateTime startedAt; + + private final String subscriptionExternalId; + + private final Map additionalProperties; + + private BillingSubscriptionDiscountView( + Optional amountOff, + String couponId, + String couponName, + Optional currency, + Optional customerFacingCode, + String discountExternalId, + String duration, + Optional durationInMonths, + Optional endedAt, + boolean isActive, + Optional percentOff, + Optional promoCodeExternalId, + OffsetDateTime startedAt, + String subscriptionExternalId, + Map additionalProperties) { + this.amountOff = amountOff; + this.couponId = couponId; + this.couponName = couponName; + this.currency = currency; + this.customerFacingCode = customerFacingCode; + this.discountExternalId = discountExternalId; + this.duration = duration; + this.durationInMonths = durationInMonths; + this.endedAt = endedAt; + this.isActive = isActive; + this.percentOff = percentOff; + this.promoCodeExternalId = promoCodeExternalId; + this.startedAt = startedAt; + this.subscriptionExternalId = subscriptionExternalId; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("amount_off") + public Optional getAmountOff() { + return amountOff; + } + + @JsonProperty("coupon_id") + public String getCouponId() { + return couponId; + } + + @JsonProperty("coupon_name") + public String getCouponName() { + return couponName; + } + + @JsonProperty("currency") + public Optional getCurrency() { + return currency; + } + + @JsonProperty("customer_facing_code") + public Optional getCustomerFacingCode() { + return customerFacingCode; + } + + @JsonProperty("discount_external_id") + public String getDiscountExternalId() { + return discountExternalId; + } + + @JsonProperty("duration") + public String getDuration() { + return duration; + } + + @JsonProperty("duration_in_months") + public Optional getDurationInMonths() { + return durationInMonths; + } + + @JsonProperty("ended_at") + public Optional getEndedAt() { + return endedAt; + } + + @JsonProperty("is_active") + public boolean getIsActive() { + return isActive; + } + + @JsonProperty("percent_off") + public Optional getPercentOff() { + return percentOff; + } + + @JsonProperty("promo_code_external_id") + public Optional getPromoCodeExternalId() { + return promoCodeExternalId; + } + + @JsonProperty("started_at") + public OffsetDateTime getStartedAt() { + return startedAt; + } + + @JsonProperty("subscription_external_id") + public String getSubscriptionExternalId() { + return subscriptionExternalId; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof BillingSubscriptionDiscountView && equalTo((BillingSubscriptionDiscountView) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(BillingSubscriptionDiscountView other) { + return amountOff.equals(other.amountOff) + && couponId.equals(other.couponId) + && couponName.equals(other.couponName) + && currency.equals(other.currency) + && customerFacingCode.equals(other.customerFacingCode) + && discountExternalId.equals(other.discountExternalId) + && duration.equals(other.duration) + && durationInMonths.equals(other.durationInMonths) + && endedAt.equals(other.endedAt) + && isActive == other.isActive + && percentOff.equals(other.percentOff) + && promoCodeExternalId.equals(other.promoCodeExternalId) + && startedAt.equals(other.startedAt) + && subscriptionExternalId.equals(other.subscriptionExternalId); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash( + this.amountOff, + this.couponId, + this.couponName, + this.currency, + this.customerFacingCode, + this.discountExternalId, + this.duration, + this.durationInMonths, + this.endedAt, + this.isActive, + this.percentOff, + this.promoCodeExternalId, + this.startedAt, + this.subscriptionExternalId); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static CouponIdStage builder() { + return new Builder(); + } + + public interface CouponIdStage { + CouponNameStage couponId(String couponId); + + Builder from(BillingSubscriptionDiscountView other); + } + + public interface CouponNameStage { + DiscountExternalIdStage couponName(String couponName); + } + + public interface DiscountExternalIdStage { + DurationStage discountExternalId(String discountExternalId); + } + + public interface DurationStage { + IsActiveStage duration(String duration); + } + + public interface IsActiveStage { + StartedAtStage isActive(boolean isActive); + } + + public interface StartedAtStage { + SubscriptionExternalIdStage startedAt(OffsetDateTime startedAt); + } + + public interface SubscriptionExternalIdStage { + _FinalStage subscriptionExternalId(String subscriptionExternalId); + } + + public interface _FinalStage { + BillingSubscriptionDiscountView build(); + + _FinalStage amountOff(Optional amountOff); + + _FinalStage amountOff(Integer amountOff); + + _FinalStage currency(Optional currency); + + _FinalStage currency(String currency); + + _FinalStage customerFacingCode(Optional customerFacingCode); + + _FinalStage customerFacingCode(String customerFacingCode); + + _FinalStage durationInMonths(Optional durationInMonths); + + _FinalStage durationInMonths(Integer durationInMonths); + + _FinalStage endedAt(Optional endedAt); + + _FinalStage endedAt(OffsetDateTime endedAt); + + _FinalStage percentOff(Optional percentOff); + + _FinalStage percentOff(Double percentOff); + + _FinalStage promoCodeExternalId(Optional promoCodeExternalId); + + _FinalStage promoCodeExternalId(String promoCodeExternalId); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder + implements CouponIdStage, + CouponNameStage, + DiscountExternalIdStage, + DurationStage, + IsActiveStage, + StartedAtStage, + SubscriptionExternalIdStage, + _FinalStage { + private String couponId; + + private String couponName; + + private String discountExternalId; + + private String duration; + + private boolean isActive; + + private OffsetDateTime startedAt; + + private String subscriptionExternalId; + + private Optional promoCodeExternalId = Optional.empty(); + + private Optional percentOff = Optional.empty(); + + private Optional endedAt = Optional.empty(); + + private Optional durationInMonths = Optional.empty(); + + private Optional customerFacingCode = Optional.empty(); + + private Optional currency = Optional.empty(); + + private Optional amountOff = Optional.empty(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(BillingSubscriptionDiscountView other) { + amountOff(other.getAmountOff()); + couponId(other.getCouponId()); + couponName(other.getCouponName()); + currency(other.getCurrency()); + customerFacingCode(other.getCustomerFacingCode()); + discountExternalId(other.getDiscountExternalId()); + duration(other.getDuration()); + durationInMonths(other.getDurationInMonths()); + endedAt(other.getEndedAt()); + isActive(other.getIsActive()); + percentOff(other.getPercentOff()); + promoCodeExternalId(other.getPromoCodeExternalId()); + startedAt(other.getStartedAt()); + subscriptionExternalId(other.getSubscriptionExternalId()); + return this; + } + + @java.lang.Override + @JsonSetter("coupon_id") + public CouponNameStage couponId(String couponId) { + this.couponId = couponId; + return this; + } + + @java.lang.Override + @JsonSetter("coupon_name") + public DiscountExternalIdStage couponName(String couponName) { + this.couponName = couponName; + return this; + } + + @java.lang.Override + @JsonSetter("discount_external_id") + public DurationStage discountExternalId(String discountExternalId) { + this.discountExternalId = discountExternalId; + return this; + } + + @java.lang.Override + @JsonSetter("duration") + public IsActiveStage duration(String duration) { + this.duration = duration; + return this; + } + + @java.lang.Override + @JsonSetter("is_active") + public StartedAtStage isActive(boolean isActive) { + this.isActive = isActive; + return this; + } + + @java.lang.Override + @JsonSetter("started_at") + public SubscriptionExternalIdStage startedAt(OffsetDateTime startedAt) { + this.startedAt = startedAt; + return this; + } + + @java.lang.Override + @JsonSetter("subscription_external_id") + public _FinalStage subscriptionExternalId(String subscriptionExternalId) { + this.subscriptionExternalId = subscriptionExternalId; + return this; + } + + @java.lang.Override + public _FinalStage promoCodeExternalId(String promoCodeExternalId) { + this.promoCodeExternalId = Optional.ofNullable(promoCodeExternalId); + return this; + } + + @java.lang.Override + @JsonSetter(value = "promo_code_external_id", nulls = Nulls.SKIP) + public _FinalStage promoCodeExternalId(Optional promoCodeExternalId) { + this.promoCodeExternalId = promoCodeExternalId; + return this; + } + + @java.lang.Override + public _FinalStage percentOff(Double percentOff) { + this.percentOff = Optional.ofNullable(percentOff); + return this; + } + + @java.lang.Override + @JsonSetter(value = "percent_off", nulls = Nulls.SKIP) + public _FinalStage percentOff(Optional percentOff) { + this.percentOff = percentOff; + return this; + } + + @java.lang.Override + public _FinalStage endedAt(OffsetDateTime endedAt) { + this.endedAt = Optional.ofNullable(endedAt); + return this; + } + + @java.lang.Override + @JsonSetter(value = "ended_at", nulls = Nulls.SKIP) + public _FinalStage endedAt(Optional endedAt) { + this.endedAt = endedAt; + return this; + } + + @java.lang.Override + public _FinalStage durationInMonths(Integer durationInMonths) { + this.durationInMonths = Optional.ofNullable(durationInMonths); + return this; + } + + @java.lang.Override + @JsonSetter(value = "duration_in_months", nulls = Nulls.SKIP) + public _FinalStage durationInMonths(Optional durationInMonths) { + this.durationInMonths = durationInMonths; + return this; + } + + @java.lang.Override + public _FinalStage customerFacingCode(String customerFacingCode) { + this.customerFacingCode = Optional.ofNullable(customerFacingCode); + return this; + } + + @java.lang.Override + @JsonSetter(value = "customer_facing_code", nulls = Nulls.SKIP) + public _FinalStage customerFacingCode(Optional customerFacingCode) { + this.customerFacingCode = customerFacingCode; + return this; + } + + @java.lang.Override + public _FinalStage currency(String currency) { + this.currency = Optional.ofNullable(currency); + return this; + } + + @java.lang.Override + @JsonSetter(value = "currency", nulls = Nulls.SKIP) + public _FinalStage currency(Optional currency) { + this.currency = currency; + return this; + } + + @java.lang.Override + public _FinalStage amountOff(Integer amountOff) { + this.amountOff = Optional.ofNullable(amountOff); + return this; + } + + @java.lang.Override + @JsonSetter(value = "amount_off", nulls = Nulls.SKIP) + public _FinalStage amountOff(Optional amountOff) { + this.amountOff = amountOff; + return this; + } + + @java.lang.Override + public BillingSubscriptionDiscountView build() { + return new BillingSubscriptionDiscountView( + amountOff, + couponId, + couponName, + currency, + customerFacingCode, + discountExternalId, + duration, + durationInMonths, + endedAt, + isActive, + percentOff, + promoCodeExternalId, + startedAt, + subscriptionExternalId, + additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/types/BillingSubscriptionResponseData.java b/src/main/java/com/schematic/api/types/BillingSubscriptionResponseData.java index ca9385c..cfb9167 100644 --- a/src/main/java/com/schematic/api/types/BillingSubscriptionResponseData.java +++ b/src/main/java/com/schematic/api/types/BillingSubscriptionResponseData.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingSubscriptionResponseData.Builder.class) public final class BillingSubscriptionResponseData { private final Optional companyId; @@ -50,6 +50,8 @@ public final class BillingSubscriptionResponseData { private final Optional trialEnd; + private final Optional trialEndSetting; + private final Map additionalProperties; private BillingSubscriptionResponseData( @@ -67,6 +69,7 @@ private BillingSubscriptionResponseData( String subscriptionExternalId, int totalPrice, Optional trialEnd, + Optional trialEndSetting, Map additionalProperties) { this.companyId = companyId; this.createdAt = createdAt; @@ -82,6 +85,7 @@ private BillingSubscriptionResponseData( this.subscriptionExternalId = subscriptionExternalId; this.totalPrice = totalPrice; this.trialEnd = trialEnd; + this.trialEndSetting = trialEndSetting; this.additionalProperties = additionalProperties; } @@ -155,6 +159,11 @@ public Optional getTrialEnd() { return trialEnd; } + @JsonProperty("trial_end_setting") + public Optional getTrialEndSetting() { + return trialEndSetting; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -180,7 +189,8 @@ private boolean equalTo(BillingSubscriptionResponseData other) { && status.equals(other.status) && subscriptionExternalId.equals(other.subscriptionExternalId) && totalPrice == other.totalPrice - && trialEnd.equals(other.trialEnd); + && trialEnd.equals(other.trialEnd) + && trialEndSetting.equals(other.trialEndSetting); } @java.lang.Override @@ -199,7 +209,8 @@ public int hashCode() { this.status, this.subscriptionExternalId, this.totalPrice, - this.trialEnd); + this.trialEnd, + this.trialEndSetting); } @java.lang.Override @@ -271,6 +282,10 @@ public interface _FinalStage { _FinalStage trialEnd(Optional trialEnd); _FinalStage trialEnd(Integer trialEnd); + + _FinalStage trialEndSetting(Optional trialEndSetting); + + _FinalStage trialEndSetting(String trialEndSetting); } @JsonIgnoreProperties(ignoreUnknown = true) @@ -306,6 +321,8 @@ public static final class Builder private int totalPrice; + private Optional trialEndSetting = Optional.empty(); + private Optional trialEnd = Optional.empty(); private Optional> metadata = Optional.empty(); @@ -335,6 +352,7 @@ public Builder from(BillingSubscriptionResponseData other) { subscriptionExternalId(other.getSubscriptionExternalId()); totalPrice(other.getTotalPrice()); trialEnd(other.getTrialEnd()); + trialEndSetting(other.getTrialEndSetting()); return this; } @@ -408,9 +426,22 @@ public _FinalStage totalPrice(int totalPrice) { return this; } + @java.lang.Override + public _FinalStage trialEndSetting(String trialEndSetting) { + this.trialEndSetting = Optional.ofNullable(trialEndSetting); + return this; + } + + @java.lang.Override + @JsonSetter(value = "trial_end_setting", nulls = Nulls.SKIP) + public _FinalStage trialEndSetting(Optional trialEndSetting) { + this.trialEndSetting = trialEndSetting; + return this; + } + @java.lang.Override public _FinalStage trialEnd(Integer trialEnd) { - this.trialEnd = Optional.of(trialEnd); + this.trialEnd = Optional.ofNullable(trialEnd); return this; } @@ -423,7 +454,7 @@ public _FinalStage trialEnd(Optional trialEnd) { @java.lang.Override public _FinalStage metadata(Map metadata) { - this.metadata = Optional.of(metadata); + this.metadata = Optional.ofNullable(metadata); return this; } @@ -436,7 +467,7 @@ public _FinalStage metadata(Optional> metadata) { @java.lang.Override public _FinalStage expiredAt(OffsetDateTime expiredAt) { - this.expiredAt = Optional.of(expiredAt); + this.expiredAt = Optional.ofNullable(expiredAt); return this; } @@ -449,7 +480,7 @@ public _FinalStage expiredAt(Optional expiredAt) { @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -477,6 +508,7 @@ public BillingSubscriptionResponseData build() { subscriptionExternalId, totalPrice, trialEnd, + trialEndSetting, additionalProperties); } } diff --git a/src/main/java/com/schematic/api/types/BillingSubscriptionView.java b/src/main/java/com/schematic/api/types/BillingSubscriptionView.java index 54946ec..b5a34f8 100644 --- a/src/main/java/com/schematic/api/types/BillingSubscriptionView.java +++ b/src/main/java/com/schematic/api/types/BillingSubscriptionView.java @@ -21,7 +21,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = BillingSubscriptionView.Builder.class) public final class BillingSubscriptionView { private final Optional companyId; @@ -32,6 +32,8 @@ public final class BillingSubscriptionView { private final String customerExternalId; + private final List discounts; + private final Optional expiredAt; private final String id; @@ -58,6 +60,8 @@ public final class BillingSubscriptionView { private final Optional trialEnd; + private final Optional trialEndSetting; + private final Map additionalProperties; private BillingSubscriptionView( @@ -65,6 +69,7 @@ private BillingSubscriptionView( OffsetDateTime createdAt, String currency, String customerExternalId, + List discounts, Optional expiredAt, String id, String interval, @@ -78,11 +83,13 @@ private BillingSubscriptionView( String subscriptionExternalId, int totalPrice, Optional trialEnd, + Optional trialEndSetting, Map additionalProperties) { this.companyId = companyId; this.createdAt = createdAt; this.currency = currency; this.customerExternalId = customerExternalId; + this.discounts = discounts; this.expiredAt = expiredAt; this.id = id; this.interval = interval; @@ -96,6 +103,7 @@ private BillingSubscriptionView( this.subscriptionExternalId = subscriptionExternalId; this.totalPrice = totalPrice; this.trialEnd = trialEnd; + this.trialEndSetting = trialEndSetting; this.additionalProperties = additionalProperties; } @@ -119,6 +127,11 @@ public String getCustomerExternalId() { return customerExternalId; } + @JsonProperty("discounts") + public List getDiscounts() { + return discounts; + } + @JsonProperty("expired_at") public Optional getExpiredAt() { return expiredAt; @@ -184,6 +197,11 @@ public Optional getTrialEnd() { return trialEnd; } + @JsonProperty("trial_end_setting") + public Optional getTrialEndSetting() { + return trialEndSetting; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -200,6 +218,7 @@ private boolean equalTo(BillingSubscriptionView other) { && createdAt.equals(other.createdAt) && currency.equals(other.currency) && customerExternalId.equals(other.customerExternalId) + && discounts.equals(other.discounts) && expiredAt.equals(other.expiredAt) && id.equals(other.id) && interval.equals(other.interval) @@ -212,7 +231,8 @@ private boolean equalTo(BillingSubscriptionView other) { && status.equals(other.status) && subscriptionExternalId.equals(other.subscriptionExternalId) && totalPrice == other.totalPrice - && trialEnd.equals(other.trialEnd); + && trialEnd.equals(other.trialEnd) + && trialEndSetting.equals(other.trialEndSetting); } @java.lang.Override @@ -222,6 +242,7 @@ public int hashCode() { this.createdAt, this.currency, this.customerExternalId, + this.discounts, this.expiredAt, this.id, this.interval, @@ -234,7 +255,8 @@ public int hashCode() { this.status, this.subscriptionExternalId, this.totalPrice, - this.trialEnd); + this.trialEnd, + this.trialEndSetting); } @java.lang.Override @@ -295,6 +317,12 @@ public interface _FinalStage { _FinalStage companyId(String companyId); + _FinalStage discounts(List discounts); + + _FinalStage addDiscounts(BillingSubscriptionDiscountView discounts); + + _FinalStage addAllDiscounts(List discounts); + _FinalStage expiredAt(Optional expiredAt); _FinalStage expiredAt(OffsetDateTime expiredAt); @@ -320,6 +348,10 @@ public interface _FinalStage { _FinalStage trialEnd(Optional trialEnd); _FinalStage trialEnd(Integer trialEnd); + + _FinalStage trialEndSetting(Optional trialEndSetting); + + _FinalStage trialEndSetting(String trialEndSetting); } @JsonIgnoreProperties(ignoreUnknown = true) @@ -355,6 +387,8 @@ public static final class Builder private int totalPrice; + private Optional trialEndSetting = Optional.empty(); + private Optional trialEnd = Optional.empty(); private List products = new ArrayList<>(); @@ -367,6 +401,8 @@ public static final class Builder private Optional expiredAt = Optional.empty(); + private List discounts = new ArrayList<>(); + private Optional companyId = Optional.empty(); @JsonAnySetter @@ -380,6 +416,7 @@ public Builder from(BillingSubscriptionView other) { createdAt(other.getCreatedAt()); currency(other.getCurrency()); customerExternalId(other.getCustomerExternalId()); + discounts(other.getDiscounts()); expiredAt(other.getExpiredAt()); id(other.getId()); interval(other.getInterval()); @@ -393,6 +430,7 @@ public Builder from(BillingSubscriptionView other) { subscriptionExternalId(other.getSubscriptionExternalId()); totalPrice(other.getTotalPrice()); trialEnd(other.getTrialEnd()); + trialEndSetting(other.getTrialEndSetting()); return this; } @@ -466,9 +504,22 @@ public _FinalStage totalPrice(int totalPrice) { return this; } + @java.lang.Override + public _FinalStage trialEndSetting(String trialEndSetting) { + this.trialEndSetting = Optional.ofNullable(trialEndSetting); + return this; + } + + @java.lang.Override + @JsonSetter(value = "trial_end_setting", nulls = Nulls.SKIP) + public _FinalStage trialEndSetting(Optional trialEndSetting) { + this.trialEndSetting = trialEndSetting; + return this; + } + @java.lang.Override public _FinalStage trialEnd(Integer trialEnd) { - this.trialEnd = Optional.of(trialEnd); + this.trialEnd = Optional.ofNullable(trialEnd); return this; } @@ -501,7 +552,7 @@ public _FinalStage products(List prod @java.lang.Override public _FinalStage paymentMethod(PaymentMethodResponseData paymentMethod) { - this.paymentMethod = Optional.of(paymentMethod); + this.paymentMethod = Optional.ofNullable(paymentMethod); return this; } @@ -514,7 +565,7 @@ public _FinalStage paymentMethod(Optional paymentMeth @java.lang.Override public _FinalStage metadata(Map metadata) { - this.metadata = Optional.of(metadata); + this.metadata = Optional.ofNullable(metadata); return this; } @@ -527,7 +578,7 @@ public _FinalStage metadata(Optional> metadata) { @java.lang.Override public _FinalStage latestInvoice(InvoiceResponseData latestInvoice) { - this.latestInvoice = Optional.of(latestInvoice); + this.latestInvoice = Optional.ofNullable(latestInvoice); return this; } @@ -540,7 +591,7 @@ public _FinalStage latestInvoice(Optional latestInvoice) { @java.lang.Override public _FinalStage expiredAt(OffsetDateTime expiredAt) { - this.expiredAt = Optional.of(expiredAt); + this.expiredAt = Optional.ofNullable(expiredAt); return this; } @@ -551,9 +602,29 @@ public _FinalStage expiredAt(Optional expiredAt) { return this; } + @java.lang.Override + public _FinalStage addAllDiscounts(List discounts) { + this.discounts.addAll(discounts); + return this; + } + + @java.lang.Override + public _FinalStage addDiscounts(BillingSubscriptionDiscountView discounts) { + this.discounts.add(discounts); + return this; + } + + @java.lang.Override + @JsonSetter(value = "discounts", nulls = Nulls.SKIP) + public _FinalStage discounts(List discounts) { + this.discounts.clear(); + this.discounts.addAll(discounts); + return this; + } + @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -571,6 +642,7 @@ public BillingSubscriptionView build() { createdAt, currency, customerExternalId, + discounts, expiredAt, id, interval, @@ -584,6 +656,7 @@ public BillingSubscriptionView build() { subscriptionExternalId, totalPrice, trialEnd, + trialEndSetting, additionalProperties); } } diff --git a/src/main/java/com/schematic/api/types/ChangeSubscriptionInternalRequestBody.java b/src/main/java/com/schematic/api/types/ChangeSubscriptionInternalRequestBody.java new file mode 100644 index 0000000..8262d59 --- /dev/null +++ b/src/main/java/com/schematic/api/types/ChangeSubscriptionInternalRequestBody.java @@ -0,0 +1,309 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = ChangeSubscriptionInternalRequestBody.Builder.class) +public final class ChangeSubscriptionInternalRequestBody { + private final List addOnIds; + + private final String companyId; + + private final String newPlanId; + + private final String newPriceId; + + private final List payInAdvance; + + private final Optional paymentMethodId; + + private final Optional promoCode; + + private final Map additionalProperties; + + private ChangeSubscriptionInternalRequestBody( + List addOnIds, + String companyId, + String newPlanId, + String newPriceId, + List payInAdvance, + Optional paymentMethodId, + Optional promoCode, + Map additionalProperties) { + this.addOnIds = addOnIds; + this.companyId = companyId; + this.newPlanId = newPlanId; + this.newPriceId = newPriceId; + this.payInAdvance = payInAdvance; + this.paymentMethodId = paymentMethodId; + this.promoCode = promoCode; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("add_on_ids") + public List getAddOnIds() { + return addOnIds; + } + + @JsonProperty("company_id") + public String getCompanyId() { + return companyId; + } + + @JsonProperty("new_plan_id") + public String getNewPlanId() { + return newPlanId; + } + + @JsonProperty("new_price_id") + public String getNewPriceId() { + return newPriceId; + } + + @JsonProperty("pay_in_advance") + public List getPayInAdvance() { + return payInAdvance; + } + + @JsonProperty("payment_method_id") + public Optional getPaymentMethodId() { + return paymentMethodId; + } + + @JsonProperty("promo_code") + public Optional getPromoCode() { + return promoCode; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof ChangeSubscriptionInternalRequestBody + && equalTo((ChangeSubscriptionInternalRequestBody) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(ChangeSubscriptionInternalRequestBody other) { + return addOnIds.equals(other.addOnIds) + && companyId.equals(other.companyId) + && newPlanId.equals(other.newPlanId) + && newPriceId.equals(other.newPriceId) + && payInAdvance.equals(other.payInAdvance) + && paymentMethodId.equals(other.paymentMethodId) + && promoCode.equals(other.promoCode); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash( + this.addOnIds, + this.companyId, + this.newPlanId, + this.newPriceId, + this.payInAdvance, + this.paymentMethodId, + this.promoCode); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static CompanyIdStage builder() { + return new Builder(); + } + + public interface CompanyIdStage { + NewPlanIdStage companyId(String companyId); + + Builder from(ChangeSubscriptionInternalRequestBody other); + } + + public interface NewPlanIdStage { + NewPriceIdStage newPlanId(String newPlanId); + } + + public interface NewPriceIdStage { + _FinalStage newPriceId(String newPriceId); + } + + public interface _FinalStage { + ChangeSubscriptionInternalRequestBody build(); + + _FinalStage addOnIds(List addOnIds); + + _FinalStage addAddOnIds(UpdateAddOnRequestBody addOnIds); + + _FinalStage addAllAddOnIds(List addOnIds); + + _FinalStage payInAdvance(List payInAdvance); + + _FinalStage addPayInAdvance(UpdatePayInAdvanceRequestBody payInAdvance); + + _FinalStage addAllPayInAdvance(List payInAdvance); + + _FinalStage paymentMethodId(Optional paymentMethodId); + + _FinalStage paymentMethodId(String paymentMethodId); + + _FinalStage promoCode(Optional promoCode); + + _FinalStage promoCode(String promoCode); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder implements CompanyIdStage, NewPlanIdStage, NewPriceIdStage, _FinalStage { + private String companyId; + + private String newPlanId; + + private String newPriceId; + + private Optional promoCode = Optional.empty(); + + private Optional paymentMethodId = Optional.empty(); + + private List payInAdvance = new ArrayList<>(); + + private List addOnIds = new ArrayList<>(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(ChangeSubscriptionInternalRequestBody other) { + addOnIds(other.getAddOnIds()); + companyId(other.getCompanyId()); + newPlanId(other.getNewPlanId()); + newPriceId(other.getNewPriceId()); + payInAdvance(other.getPayInAdvance()); + paymentMethodId(other.getPaymentMethodId()); + promoCode(other.getPromoCode()); + return this; + } + + @java.lang.Override + @JsonSetter("company_id") + public NewPlanIdStage companyId(String companyId) { + this.companyId = companyId; + return this; + } + + @java.lang.Override + @JsonSetter("new_plan_id") + public NewPriceIdStage newPlanId(String newPlanId) { + this.newPlanId = newPlanId; + return this; + } + + @java.lang.Override + @JsonSetter("new_price_id") + public _FinalStage newPriceId(String newPriceId) { + this.newPriceId = newPriceId; + return this; + } + + @java.lang.Override + public _FinalStage promoCode(String promoCode) { + this.promoCode = Optional.ofNullable(promoCode); + return this; + } + + @java.lang.Override + @JsonSetter(value = "promo_code", nulls = Nulls.SKIP) + public _FinalStage promoCode(Optional promoCode) { + this.promoCode = promoCode; + return this; + } + + @java.lang.Override + public _FinalStage paymentMethodId(String paymentMethodId) { + this.paymentMethodId = Optional.ofNullable(paymentMethodId); + return this; + } + + @java.lang.Override + @JsonSetter(value = "payment_method_id", nulls = Nulls.SKIP) + public _FinalStage paymentMethodId(Optional paymentMethodId) { + this.paymentMethodId = paymentMethodId; + return this; + } + + @java.lang.Override + public _FinalStage addAllPayInAdvance(List payInAdvance) { + this.payInAdvance.addAll(payInAdvance); + return this; + } + + @java.lang.Override + public _FinalStage addPayInAdvance(UpdatePayInAdvanceRequestBody payInAdvance) { + this.payInAdvance.add(payInAdvance); + return this; + } + + @java.lang.Override + @JsonSetter(value = "pay_in_advance", nulls = Nulls.SKIP) + public _FinalStage payInAdvance(List payInAdvance) { + this.payInAdvance.clear(); + this.payInAdvance.addAll(payInAdvance); + return this; + } + + @java.lang.Override + public _FinalStage addAllAddOnIds(List addOnIds) { + this.addOnIds.addAll(addOnIds); + return this; + } + + @java.lang.Override + public _FinalStage addAddOnIds(UpdateAddOnRequestBody addOnIds) { + this.addOnIds.add(addOnIds); + return this; + } + + @java.lang.Override + @JsonSetter(value = "add_on_ids", nulls = Nulls.SKIP) + public _FinalStage addOnIds(List addOnIds) { + this.addOnIds.clear(); + this.addOnIds.addAll(addOnIds); + return this; + } + + @java.lang.Override + public ChangeSubscriptionInternalRequestBody build() { + return new ChangeSubscriptionInternalRequestBody( + addOnIds, + companyId, + newPlanId, + newPriceId, + payInAdvance, + paymentMethodId, + promoCode, + additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/types/ChangeSubscriptionRequestBody.java b/src/main/java/com/schematic/api/types/ChangeSubscriptionRequestBody.java new file mode 100644 index 0000000..00a25fd --- /dev/null +++ b/src/main/java/com/schematic/api/types/ChangeSubscriptionRequestBody.java @@ -0,0 +1,276 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = ChangeSubscriptionRequestBody.Builder.class) +public final class ChangeSubscriptionRequestBody { + private final List addOnIds; + + private final String newPlanId; + + private final String newPriceId; + + private final List payInAdvance; + + private final Optional paymentMethodId; + + private final Optional promoCode; + + private final Map additionalProperties; + + private ChangeSubscriptionRequestBody( + List addOnIds, + String newPlanId, + String newPriceId, + List payInAdvance, + Optional paymentMethodId, + Optional promoCode, + Map additionalProperties) { + this.addOnIds = addOnIds; + this.newPlanId = newPlanId; + this.newPriceId = newPriceId; + this.payInAdvance = payInAdvance; + this.paymentMethodId = paymentMethodId; + this.promoCode = promoCode; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("add_on_ids") + public List getAddOnIds() { + return addOnIds; + } + + @JsonProperty("new_plan_id") + public String getNewPlanId() { + return newPlanId; + } + + @JsonProperty("new_price_id") + public String getNewPriceId() { + return newPriceId; + } + + @JsonProperty("pay_in_advance") + public List getPayInAdvance() { + return payInAdvance; + } + + @JsonProperty("payment_method_id") + public Optional getPaymentMethodId() { + return paymentMethodId; + } + + @JsonProperty("promo_code") + public Optional getPromoCode() { + return promoCode; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof ChangeSubscriptionRequestBody && equalTo((ChangeSubscriptionRequestBody) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(ChangeSubscriptionRequestBody other) { + return addOnIds.equals(other.addOnIds) + && newPlanId.equals(other.newPlanId) + && newPriceId.equals(other.newPriceId) + && payInAdvance.equals(other.payInAdvance) + && paymentMethodId.equals(other.paymentMethodId) + && promoCode.equals(other.promoCode); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash( + this.addOnIds, + this.newPlanId, + this.newPriceId, + this.payInAdvance, + this.paymentMethodId, + this.promoCode); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static NewPlanIdStage builder() { + return new Builder(); + } + + public interface NewPlanIdStage { + NewPriceIdStage newPlanId(String newPlanId); + + Builder from(ChangeSubscriptionRequestBody other); + } + + public interface NewPriceIdStage { + _FinalStage newPriceId(String newPriceId); + } + + public interface _FinalStage { + ChangeSubscriptionRequestBody build(); + + _FinalStage addOnIds(List addOnIds); + + _FinalStage addAddOnIds(UpdateAddOnRequestBody addOnIds); + + _FinalStage addAllAddOnIds(List addOnIds); + + _FinalStage payInAdvance(List payInAdvance); + + _FinalStage addPayInAdvance(UpdatePayInAdvanceRequestBody payInAdvance); + + _FinalStage addAllPayInAdvance(List payInAdvance); + + _FinalStage paymentMethodId(Optional paymentMethodId); + + _FinalStage paymentMethodId(String paymentMethodId); + + _FinalStage promoCode(Optional promoCode); + + _FinalStage promoCode(String promoCode); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder implements NewPlanIdStage, NewPriceIdStage, _FinalStage { + private String newPlanId; + + private String newPriceId; + + private Optional promoCode = Optional.empty(); + + private Optional paymentMethodId = Optional.empty(); + + private List payInAdvance = new ArrayList<>(); + + private List addOnIds = new ArrayList<>(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(ChangeSubscriptionRequestBody other) { + addOnIds(other.getAddOnIds()); + newPlanId(other.getNewPlanId()); + newPriceId(other.getNewPriceId()); + payInAdvance(other.getPayInAdvance()); + paymentMethodId(other.getPaymentMethodId()); + promoCode(other.getPromoCode()); + return this; + } + + @java.lang.Override + @JsonSetter("new_plan_id") + public NewPriceIdStage newPlanId(String newPlanId) { + this.newPlanId = newPlanId; + return this; + } + + @java.lang.Override + @JsonSetter("new_price_id") + public _FinalStage newPriceId(String newPriceId) { + this.newPriceId = newPriceId; + return this; + } + + @java.lang.Override + public _FinalStage promoCode(String promoCode) { + this.promoCode = Optional.ofNullable(promoCode); + return this; + } + + @java.lang.Override + @JsonSetter(value = "promo_code", nulls = Nulls.SKIP) + public _FinalStage promoCode(Optional promoCode) { + this.promoCode = promoCode; + return this; + } + + @java.lang.Override + public _FinalStage paymentMethodId(String paymentMethodId) { + this.paymentMethodId = Optional.ofNullable(paymentMethodId); + return this; + } + + @java.lang.Override + @JsonSetter(value = "payment_method_id", nulls = Nulls.SKIP) + public _FinalStage paymentMethodId(Optional paymentMethodId) { + this.paymentMethodId = paymentMethodId; + return this; + } + + @java.lang.Override + public _FinalStage addAllPayInAdvance(List payInAdvance) { + this.payInAdvance.addAll(payInAdvance); + return this; + } + + @java.lang.Override + public _FinalStage addPayInAdvance(UpdatePayInAdvanceRequestBody payInAdvance) { + this.payInAdvance.add(payInAdvance); + return this; + } + + @java.lang.Override + @JsonSetter(value = "pay_in_advance", nulls = Nulls.SKIP) + public _FinalStage payInAdvance(List payInAdvance) { + this.payInAdvance.clear(); + this.payInAdvance.addAll(payInAdvance); + return this; + } + + @java.lang.Override + public _FinalStage addAllAddOnIds(List addOnIds) { + this.addOnIds.addAll(addOnIds); + return this; + } + + @java.lang.Override + public _FinalStage addAddOnIds(UpdateAddOnRequestBody addOnIds) { + this.addOnIds.add(addOnIds); + return this; + } + + @java.lang.Override + @JsonSetter(value = "add_on_ids", nulls = Nulls.SKIP) + public _FinalStage addOnIds(List addOnIds) { + this.addOnIds.clear(); + this.addOnIds.addAll(addOnIds); + return this; + } + + @java.lang.Override + public ChangeSubscriptionRequestBody build() { + return new ChangeSubscriptionRequestBody( + addOnIds, newPlanId, newPriceId, payInAdvance, paymentMethodId, promoCode, additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/types/CheckFlagOutputWithFlagKey.java b/src/main/java/com/schematic/api/types/CheckFlagOutputWithFlagKey.java index 8e16e7d..f5da13a 100644 --- a/src/main/java/com/schematic/api/types/CheckFlagOutputWithFlagKey.java +++ b/src/main/java/com/schematic/api/types/CheckFlagOutputWithFlagKey.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CheckFlagOutputWithFlagKey.Builder.class) public final class CheckFlagOutputWithFlagKey { private final Optional companyId; @@ -233,7 +233,7 @@ public _FinalStage value(boolean value) { @java.lang.Override public _FinalStage userId(String userId) { - this.userId = Optional.of(userId); + this.userId = Optional.ofNullable(userId); return this; } @@ -246,7 +246,7 @@ public _FinalStage userId(Optional userId) { @java.lang.Override public _FinalStage ruleId(String ruleId) { - this.ruleId = Optional.of(ruleId); + this.ruleId = Optional.ofNullable(ruleId); return this; } @@ -259,7 +259,7 @@ public _FinalStage ruleId(Optional ruleId) { @java.lang.Override public _FinalStage flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } @@ -272,7 +272,7 @@ public _FinalStage flagId(Optional flagId) { @java.lang.Override public _FinalStage error(String error) { - this.error = Optional.of(error); + this.error = Optional.ofNullable(error); return this; } @@ -285,7 +285,7 @@ public _FinalStage error(Optional error) { @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } diff --git a/src/main/java/com/schematic/api/types/CheckFlagRequestBody.java b/src/main/java/com/schematic/api/types/CheckFlagRequestBody.java index 4eadfed..9cd88ad 100644 --- a/src/main/java/com/schematic/api/types/CheckFlagRequestBody.java +++ b/src/main/java/com/schematic/api/types/CheckFlagRequestBody.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CheckFlagRequestBody.Builder.class) public final class CheckFlagRequestBody { private final Optional> company; @@ -98,7 +98,7 @@ public Builder company(Optional> company) { } public Builder company(Map company) { - this.company = Optional.of(company); + this.company = Optional.ofNullable(company); return this; } @@ -109,7 +109,7 @@ public Builder user(Optional> user) { } public Builder user(Map user) { - this.user = Optional.of(user); + this.user = Optional.ofNullable(user); return this; } diff --git a/src/main/java/com/schematic/api/types/CheckFlagResponseData.java b/src/main/java/com/schematic/api/types/CheckFlagResponseData.java index ef01993..495bb71 100644 --- a/src/main/java/com/schematic/api/types/CheckFlagResponseData.java +++ b/src/main/java/com/schematic/api/types/CheckFlagResponseData.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CheckFlagResponseData.Builder.class) public final class CheckFlagResponseData { private final Optional companyId; @@ -208,7 +208,7 @@ public _FinalStage value(boolean value) { @java.lang.Override public _FinalStage userId(String userId) { - this.userId = Optional.of(userId); + this.userId = Optional.ofNullable(userId); return this; } @@ -221,7 +221,7 @@ public _FinalStage userId(Optional userId) { @java.lang.Override public _FinalStage ruleId(String ruleId) { - this.ruleId = Optional.of(ruleId); + this.ruleId = Optional.ofNullable(ruleId); return this; } @@ -234,7 +234,7 @@ public _FinalStage ruleId(Optional ruleId) { @java.lang.Override public _FinalStage flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } @@ -247,7 +247,7 @@ public _FinalStage flagId(Optional flagId) { @java.lang.Override public _FinalStage error(String error) { - this.error = Optional.of(error); + this.error = Optional.ofNullable(error); return this; } @@ -260,7 +260,7 @@ public _FinalStage error(Optional error) { @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } diff --git a/src/main/java/com/schematic/api/types/CheckFlagsResponseData.java b/src/main/java/com/schematic/api/types/CheckFlagsResponseData.java index 1de806d..822daf5 100644 --- a/src/main/java/com/schematic/api/types/CheckFlagsResponseData.java +++ b/src/main/java/com/schematic/api/types/CheckFlagsResponseData.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CheckFlagsResponseData.Builder.class) public final class CheckFlagsResponseData { private final List flags; diff --git a/src/main/java/com/schematic/api/types/CompanyCrmDealsResponseData.java b/src/main/java/com/schematic/api/types/CompanyCrmDealsResponseData.java index 9eea481..7b2d19b 100644 --- a/src/main/java/com/schematic/api/types/CompanyCrmDealsResponseData.java +++ b/src/main/java/com/schematic/api/types/CompanyCrmDealsResponseData.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CompanyCrmDealsResponseData.Builder.class) public final class CompanyCrmDealsResponseData { private final String dealArr; @@ -205,7 +205,7 @@ public _FinalStage lineItems(List lineItems) { @java.lang.Override public _FinalStage dealName(String dealName) { - this.dealName = Optional.of(dealName); + this.dealName = Optional.ofNullable(dealName); return this; } diff --git a/src/main/java/com/schematic/api/types/CompanyDetailResponseData.java b/src/main/java/com/schematic/api/types/CompanyDetailResponseData.java index d2d8999..9dc1d24 100644 --- a/src/main/java/com/schematic/api/types/CompanyDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/CompanyDetailResponseData.java @@ -21,7 +21,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CompanyDetailResponseData.Builder.class) public final class CompanyDetailResponseData { private final List addOns; @@ -44,6 +44,8 @@ public final class CompanyDetailResponseData { private final Optional logoUrl; + private final List metrics; + private final String name; private final Optional plan; @@ -69,6 +71,7 @@ private CompanyDetailResponseData( List keys, Optional lastSeenAt, Optional logoUrl, + List metrics, String name, Optional plan, List plans, @@ -86,6 +89,7 @@ private CompanyDetailResponseData( this.keys = keys; this.lastSeenAt = lastSeenAt; this.logoUrl = logoUrl; + this.metrics = metrics; this.name = name; this.plan = plan; this.plans = plans; @@ -145,6 +149,11 @@ public Optional getLogoUrl() { return logoUrl; } + @JsonProperty("metrics") + public List getMetrics() { + return metrics; + } + @JsonProperty("name") public String getName() { return name; @@ -200,6 +209,7 @@ private boolean equalTo(CompanyDetailResponseData other) { && keys.equals(other.keys) && lastSeenAt.equals(other.lastSeenAt) && logoUrl.equals(other.logoUrl) + && metrics.equals(other.metrics) && name.equals(other.name) && plan.equals(other.plan) && plans.equals(other.plans) @@ -221,6 +231,7 @@ public int hashCode() { this.keys, this.lastSeenAt, this.logoUrl, + this.metrics, this.name, this.plan, this.plans, @@ -303,6 +314,12 @@ public interface _FinalStage { _FinalStage logoUrl(String logoUrl); + _FinalStage metrics(List metrics); + + _FinalStage addMetrics(CompanyEventPeriodMetricsResponseData metrics); + + _FinalStage addAllMetrics(List metrics); + _FinalStage plan(Optional plan); _FinalStage plan(CompanyPlanWithBillingSubView plan); @@ -345,6 +362,8 @@ public static final class Builder private Optional plan = Optional.empty(); + private List metrics = new ArrayList<>(); + private Optional logoUrl = Optional.empty(); private Optional lastSeenAt = Optional.empty(); @@ -376,6 +395,7 @@ public Builder from(CompanyDetailResponseData other) { keys(other.getKeys()); lastSeenAt(other.getLastSeenAt()); logoUrl(other.getLogoUrl()); + metrics(other.getMetrics()); name(other.getName()); plan(other.getPlan()); plans(other.getPlans()); @@ -433,7 +453,7 @@ public _FinalStage userCount(int userCount) { */ @java.lang.Override public _FinalStage traits(Map traits) { - this.traits = Optional.of(traits); + this.traits = Optional.ofNullable(traits); return this; } @@ -466,7 +486,7 @@ public _FinalStage plans(List plans) { @java.lang.Override public _FinalStage plan(CompanyPlanWithBillingSubView plan) { - this.plan = Optional.of(plan); + this.plan = Optional.ofNullable(plan); return this; } @@ -477,9 +497,29 @@ public _FinalStage plan(Optional plan) { return this; } + @java.lang.Override + public _FinalStage addAllMetrics(List metrics) { + this.metrics.addAll(metrics); + return this; + } + + @java.lang.Override + public _FinalStage addMetrics(CompanyEventPeriodMetricsResponseData metrics) { + this.metrics.add(metrics); + return this; + } + + @java.lang.Override + @JsonSetter(value = "metrics", nulls = Nulls.SKIP) + public _FinalStage metrics(List metrics) { + this.metrics.clear(); + this.metrics.addAll(metrics); + return this; + } + @java.lang.Override public _FinalStage logoUrl(String logoUrl) { - this.logoUrl = Optional.of(logoUrl); + this.logoUrl = Optional.ofNullable(logoUrl); return this; } @@ -492,7 +532,7 @@ public _FinalStage logoUrl(Optional logoUrl) { @java.lang.Override public _FinalStage lastSeenAt(OffsetDateTime lastSeenAt) { - this.lastSeenAt = Optional.of(lastSeenAt); + this.lastSeenAt = Optional.ofNullable(lastSeenAt); return this; } @@ -565,7 +605,7 @@ public _FinalStage billingSubscriptions(List billingSub @java.lang.Override public _FinalStage billingSubscription(BillingSubscriptionView billingSubscription) { - this.billingSubscription = Optional.of(billingSubscription); + this.billingSubscription = Optional.ofNullable(billingSubscription); return this; } @@ -609,6 +649,7 @@ public CompanyDetailResponseData build() { keys, lastSeenAt, logoUrl, + metrics, name, plan, plans, diff --git a/src/main/java/com/schematic/api/types/CompanyEventPeriodMetricsResponseData.java b/src/main/java/com/schematic/api/types/CompanyEventPeriodMetricsResponseData.java new file mode 100644 index 0000000..a5415cc --- /dev/null +++ b/src/main/java/com/schematic/api/types/CompanyEventPeriodMetricsResponseData.java @@ -0,0 +1,387 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = CompanyEventPeriodMetricsResponseData.Builder.class) +public final class CompanyEventPeriodMetricsResponseData { + private final String accountId; + + private final OffsetDateTime capturedAtMax; + + private final OffsetDateTime capturedAtMin; + + private final String companyId; + + private final OffsetDateTime createdAt; + + private final String environmentId; + + private final String eventSubtype; + + private final String monthReset; + + private final String period; + + private final Optional validUntil; + + private final int value; + + private final Map additionalProperties; + + private CompanyEventPeriodMetricsResponseData( + String accountId, + OffsetDateTime capturedAtMax, + OffsetDateTime capturedAtMin, + String companyId, + OffsetDateTime createdAt, + String environmentId, + String eventSubtype, + String monthReset, + String period, + Optional validUntil, + int value, + Map additionalProperties) { + this.accountId = accountId; + this.capturedAtMax = capturedAtMax; + this.capturedAtMin = capturedAtMin; + this.companyId = companyId; + this.createdAt = createdAt; + this.environmentId = environmentId; + this.eventSubtype = eventSubtype; + this.monthReset = monthReset; + this.period = period; + this.validUntil = validUntil; + this.value = value; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("account_id") + public String getAccountId() { + return accountId; + } + + @JsonProperty("captured_at_max") + public OffsetDateTime getCapturedAtMax() { + return capturedAtMax; + } + + @JsonProperty("captured_at_min") + public OffsetDateTime getCapturedAtMin() { + return capturedAtMin; + } + + @JsonProperty("company_id") + public String getCompanyId() { + return companyId; + } + + @JsonProperty("created_at") + public OffsetDateTime getCreatedAt() { + return createdAt; + } + + @JsonProperty("environment_id") + public String getEnvironmentId() { + return environmentId; + } + + @JsonProperty("event_subtype") + public String getEventSubtype() { + return eventSubtype; + } + + @JsonProperty("month_reset") + public String getMonthReset() { + return monthReset; + } + + @JsonProperty("period") + public String getPeriod() { + return period; + } + + @JsonProperty("valid_until") + public Optional getValidUntil() { + return validUntil; + } + + @JsonProperty("value") + public int getValue() { + return value; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof CompanyEventPeriodMetricsResponseData + && equalTo((CompanyEventPeriodMetricsResponseData) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(CompanyEventPeriodMetricsResponseData other) { + return accountId.equals(other.accountId) + && capturedAtMax.equals(other.capturedAtMax) + && capturedAtMin.equals(other.capturedAtMin) + && companyId.equals(other.companyId) + && createdAt.equals(other.createdAt) + && environmentId.equals(other.environmentId) + && eventSubtype.equals(other.eventSubtype) + && monthReset.equals(other.monthReset) + && period.equals(other.period) + && validUntil.equals(other.validUntil) + && value == other.value; + } + + @java.lang.Override + public int hashCode() { + return Objects.hash( + this.accountId, + this.capturedAtMax, + this.capturedAtMin, + this.companyId, + this.createdAt, + this.environmentId, + this.eventSubtype, + this.monthReset, + this.period, + this.validUntil, + this.value); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static AccountIdStage builder() { + return new Builder(); + } + + public interface AccountIdStage { + CapturedAtMaxStage accountId(String accountId); + + Builder from(CompanyEventPeriodMetricsResponseData other); + } + + public interface CapturedAtMaxStage { + CapturedAtMinStage capturedAtMax(OffsetDateTime capturedAtMax); + } + + public interface CapturedAtMinStage { + CompanyIdStage capturedAtMin(OffsetDateTime capturedAtMin); + } + + public interface CompanyIdStage { + CreatedAtStage companyId(String companyId); + } + + public interface CreatedAtStage { + EnvironmentIdStage createdAt(OffsetDateTime createdAt); + } + + public interface EnvironmentIdStage { + EventSubtypeStage environmentId(String environmentId); + } + + public interface EventSubtypeStage { + MonthResetStage eventSubtype(String eventSubtype); + } + + public interface MonthResetStage { + PeriodStage monthReset(String monthReset); + } + + public interface PeriodStage { + ValueStage period(String period); + } + + public interface ValueStage { + _FinalStage value(int value); + } + + public interface _FinalStage { + CompanyEventPeriodMetricsResponseData build(); + + _FinalStage validUntil(Optional validUntil); + + _FinalStage validUntil(OffsetDateTime validUntil); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder + implements AccountIdStage, + CapturedAtMaxStage, + CapturedAtMinStage, + CompanyIdStage, + CreatedAtStage, + EnvironmentIdStage, + EventSubtypeStage, + MonthResetStage, + PeriodStage, + ValueStage, + _FinalStage { + private String accountId; + + private OffsetDateTime capturedAtMax; + + private OffsetDateTime capturedAtMin; + + private String companyId; + + private OffsetDateTime createdAt; + + private String environmentId; + + private String eventSubtype; + + private String monthReset; + + private String period; + + private int value; + + private Optional validUntil = Optional.empty(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(CompanyEventPeriodMetricsResponseData other) { + accountId(other.getAccountId()); + capturedAtMax(other.getCapturedAtMax()); + capturedAtMin(other.getCapturedAtMin()); + companyId(other.getCompanyId()); + createdAt(other.getCreatedAt()); + environmentId(other.getEnvironmentId()); + eventSubtype(other.getEventSubtype()); + monthReset(other.getMonthReset()); + period(other.getPeriod()); + validUntil(other.getValidUntil()); + value(other.getValue()); + return this; + } + + @java.lang.Override + @JsonSetter("account_id") + public CapturedAtMaxStage accountId(String accountId) { + this.accountId = accountId; + return this; + } + + @java.lang.Override + @JsonSetter("captured_at_max") + public CapturedAtMinStage capturedAtMax(OffsetDateTime capturedAtMax) { + this.capturedAtMax = capturedAtMax; + return this; + } + + @java.lang.Override + @JsonSetter("captured_at_min") + public CompanyIdStage capturedAtMin(OffsetDateTime capturedAtMin) { + this.capturedAtMin = capturedAtMin; + return this; + } + + @java.lang.Override + @JsonSetter("company_id") + public CreatedAtStage companyId(String companyId) { + this.companyId = companyId; + return this; + } + + @java.lang.Override + @JsonSetter("created_at") + public EnvironmentIdStage createdAt(OffsetDateTime createdAt) { + this.createdAt = createdAt; + return this; + } + + @java.lang.Override + @JsonSetter("environment_id") + public EventSubtypeStage environmentId(String environmentId) { + this.environmentId = environmentId; + return this; + } + + @java.lang.Override + @JsonSetter("event_subtype") + public MonthResetStage eventSubtype(String eventSubtype) { + this.eventSubtype = eventSubtype; + return this; + } + + @java.lang.Override + @JsonSetter("month_reset") + public PeriodStage monthReset(String monthReset) { + this.monthReset = monthReset; + return this; + } + + @java.lang.Override + @JsonSetter("period") + public ValueStage period(String period) { + this.period = period; + return this; + } + + @java.lang.Override + @JsonSetter("value") + public _FinalStage value(int value) { + this.value = value; + return this; + } + + @java.lang.Override + public _FinalStage validUntil(OffsetDateTime validUntil) { + this.validUntil = Optional.ofNullable(validUntil); + return this; + } + + @java.lang.Override + @JsonSetter(value = "valid_until", nulls = Nulls.SKIP) + public _FinalStage validUntil(Optional validUntil) { + this.validUntil = validUntil; + return this; + } + + @java.lang.Override + public CompanyEventPeriodMetricsResponseData build() { + return new CompanyEventPeriodMetricsResponseData( + accountId, + capturedAtMax, + capturedAtMin, + companyId, + createdAt, + environmentId, + eventSubtype, + monthReset, + period, + validUntil, + value, + additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/types/CompanyMembershipDetailResponseData.java b/src/main/java/com/schematic/api/types/CompanyMembershipDetailResponseData.java index 9cc153c..72b13f0 100644 --- a/src/main/java/com/schematic/api/types/CompanyMembershipDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/CompanyMembershipDetailResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CompanyMembershipDetailResponseData.Builder.class) public final class CompanyMembershipDetailResponseData { private final Optional company; @@ -215,7 +215,7 @@ public _FinalStage userId(String userId) { @java.lang.Override public _FinalStage company(CompanyResponseData company) { - this.company = Optional.of(company); + this.company = Optional.ofNullable(company); return this; } diff --git a/src/main/java/com/schematic/api/types/CompanyMembershipResponseData.java b/src/main/java/com/schematic/api/types/CompanyMembershipResponseData.java index e7ae075..297d23a 100644 --- a/src/main/java/com/schematic/api/types/CompanyMembershipResponseData.java +++ b/src/main/java/com/schematic/api/types/CompanyMembershipResponseData.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CompanyMembershipResponseData.Builder.class) public final class CompanyMembershipResponseData { private final String companyId; diff --git a/src/main/java/com/schematic/api/types/CompanyOverrideResponseData.java b/src/main/java/com/schematic/api/types/CompanyOverrideResponseData.java index ded2f00..a5c8f3a 100644 --- a/src/main/java/com/schematic/api/types/CompanyOverrideResponseData.java +++ b/src/main/java/com/schematic/api/types/CompanyOverrideResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CompanyOverrideResponseData.Builder.class) public final class CompanyOverrideResponseData { private final Optional company; @@ -439,7 +439,7 @@ public _FinalStage valueType(String valueType) { @java.lang.Override public _FinalStage valueTraitId(String valueTraitId) { - this.valueTraitId = Optional.of(valueTraitId); + this.valueTraitId = Optional.ofNullable(valueTraitId); return this; } @@ -452,7 +452,7 @@ public _FinalStage valueTraitId(Optional valueTraitId) { @java.lang.Override public _FinalStage valueTrait(EntityTraitDefinitionResponseData valueTrait) { - this.valueTrait = Optional.of(valueTrait); + this.valueTrait = Optional.ofNullable(valueTrait); return this; } @@ -465,7 +465,7 @@ public _FinalStage valueTrait(Optional valueT @java.lang.Override public _FinalStage valueNumeric(Integer valueNumeric) { - this.valueNumeric = Optional.of(valueNumeric); + this.valueNumeric = Optional.ofNullable(valueNumeric); return this; } @@ -478,7 +478,7 @@ public _FinalStage valueNumeric(Optional valueNumeric) { @java.lang.Override public _FinalStage valueBool(Boolean valueBool) { - this.valueBool = Optional.of(valueBool); + this.valueBool = Optional.ofNullable(valueBool); return this; } @@ -491,7 +491,7 @@ public _FinalStage valueBool(Optional valueBool) { @java.lang.Override public _FinalStage ruleId(String ruleId) { - this.ruleId = Optional.of(ruleId); + this.ruleId = Optional.ofNullable(ruleId); return this; } @@ -504,7 +504,7 @@ public _FinalStage ruleId(Optional ruleId) { @java.lang.Override public _FinalStage metricPeriodMonthReset(String metricPeriodMonthReset) { - this.metricPeriodMonthReset = Optional.of(metricPeriodMonthReset); + this.metricPeriodMonthReset = Optional.ofNullable(metricPeriodMonthReset); return this; } @@ -517,7 +517,7 @@ public _FinalStage metricPeriodMonthReset(Optional metricPeriodMonthRese @java.lang.Override public _FinalStage metricPeriod(String metricPeriod) { - this.metricPeriod = Optional.of(metricPeriod); + this.metricPeriod = Optional.ofNullable(metricPeriod); return this; } @@ -530,7 +530,7 @@ public _FinalStage metricPeriod(Optional metricPeriod) { @java.lang.Override public _FinalStage feature(FeatureResponseData feature) { - this.feature = Optional.of(feature); + this.feature = Optional.ofNullable(feature); return this; } @@ -543,7 +543,7 @@ public _FinalStage feature(Optional feature) { @java.lang.Override public _FinalStage expirationDate(OffsetDateTime expirationDate) { - this.expirationDate = Optional.of(expirationDate); + this.expirationDate = Optional.ofNullable(expirationDate); return this; } @@ -556,7 +556,7 @@ public _FinalStage expirationDate(Optional expirationDate) { @java.lang.Override public _FinalStage company(CompanyDetailResponseData company) { - this.company = Optional.of(company); + this.company = Optional.ofNullable(company); return this; } diff --git a/src/main/java/com/schematic/api/types/CompanyPlanDetailResponseData.java b/src/main/java/com/schematic/api/types/CompanyPlanDetailResponseData.java index 8e236a7..d91a677 100644 --- a/src/main/java/com/schematic/api/types/CompanyPlanDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/CompanyPlanDetailResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CompanyPlanDetailResponseData.Builder.class) public final class CompanyPlanDetailResponseData { private final Optional audienceType; @@ -573,7 +573,7 @@ public _FinalStage valid(boolean valid) { @java.lang.Override public _FinalStage yearlyPrice(BillingPriceResponseData yearlyPrice) { - this.yearlyPrice = Optional.of(yearlyPrice); + this.yearlyPrice = Optional.ofNullable(yearlyPrice); return this; } @@ -586,7 +586,7 @@ public _FinalStage yearlyPrice(Optional yearlyPrice) { @java.lang.Override public _FinalStage trialDays(Integer trialDays) { - this.trialDays = Optional.of(trialDays); + this.trialDays = Optional.ofNullable(trialDays); return this; } @@ -599,7 +599,7 @@ public _FinalStage trialDays(Optional trialDays) { @java.lang.Override public _FinalStage monthlyPrice(BillingPriceResponseData monthlyPrice) { - this.monthlyPrice = Optional.of(monthlyPrice); + this.monthlyPrice = Optional.ofNullable(monthlyPrice); return this; } @@ -652,7 +652,7 @@ public _FinalStage entitlements(List entitlements) @java.lang.Override public _FinalStage billingProduct(BillingProductDetailResponseData billingProduct) { - this.billingProduct = Optional.of(billingProduct); + this.billingProduct = Optional.ofNullable(billingProduct); return this; } @@ -665,7 +665,7 @@ public _FinalStage billingProduct(Optional bil @java.lang.Override public _FinalStage audienceType(String audienceType) { - this.audienceType = Optional.of(audienceType); + this.audienceType = Optional.ofNullable(audienceType); return this; } diff --git a/src/main/java/com/schematic/api/types/CompanyPlanWithBillingSubView.java b/src/main/java/com/schematic/api/types/CompanyPlanWithBillingSubView.java index bd82b48..c881849 100644 --- a/src/main/java/com/schematic/api/types/CompanyPlanWithBillingSubView.java +++ b/src/main/java/com/schematic/api/types/CompanyPlanWithBillingSubView.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CompanyPlanWithBillingSubView.Builder.class) public final class CompanyPlanWithBillingSubView { private final Optional billingProductId; @@ -215,7 +215,7 @@ public _FinalStage name(String name) { @java.lang.Override public _FinalStage planPrice(Integer planPrice) { - this.planPrice = Optional.of(planPrice); + this.planPrice = Optional.ofNullable(planPrice); return this; } @@ -228,7 +228,7 @@ public _FinalStage planPrice(Optional planPrice) { @java.lang.Override public _FinalStage planPeriod(String planPeriod) { - this.planPeriod = Optional.of(planPeriod); + this.planPeriod = Optional.ofNullable(planPeriod); return this; } @@ -241,7 +241,7 @@ public _FinalStage planPeriod(Optional planPeriod) { @java.lang.Override public _FinalStage imageUrl(String imageUrl) { - this.imageUrl = Optional.of(imageUrl); + this.imageUrl = Optional.ofNullable(imageUrl); return this; } @@ -254,7 +254,7 @@ public _FinalStage imageUrl(Optional imageUrl) { @java.lang.Override public _FinalStage description(String description) { - this.description = Optional.of(description); + this.description = Optional.ofNullable(description); return this; } @@ -267,7 +267,7 @@ public _FinalStage description(Optional description) { @java.lang.Override public _FinalStage billingProductId(String billingProductId) { - this.billingProductId = Optional.of(billingProductId); + this.billingProductId = Optional.ofNullable(billingProductId); return this; } diff --git a/src/main/java/com/schematic/api/types/CompanyResponseData.java b/src/main/java/com/schematic/api/types/CompanyResponseData.java index 4d4d487..2a6746f 100644 --- a/src/main/java/com/schematic/api/types/CompanyResponseData.java +++ b/src/main/java/com/schematic/api/types/CompanyResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CompanyResponseData.Builder.class) public final class CompanyResponseData { private final OffsetDateTime createdAt; @@ -232,7 +232,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage logoUrl(String logoUrl) { - this.logoUrl = Optional.of(logoUrl); + this.logoUrl = Optional.ofNullable(logoUrl); return this; } @@ -245,7 +245,7 @@ public _FinalStage logoUrl(Optional logoUrl) { @java.lang.Override public _FinalStage lastSeenAt(OffsetDateTime lastSeenAt) { - this.lastSeenAt = Optional.of(lastSeenAt); + this.lastSeenAt = Optional.ofNullable(lastSeenAt); return this; } diff --git a/src/main/java/com/schematic/api/types/CompanySubscriptionResponseData.java b/src/main/java/com/schematic/api/types/CompanySubscriptionResponseData.java index f71e569..d5503e9 100644 --- a/src/main/java/com/schematic/api/types/CompanySubscriptionResponseData.java +++ b/src/main/java/com/schematic/api/types/CompanySubscriptionResponseData.java @@ -20,13 +20,15 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CompanySubscriptionResponseData.Builder.class) public final class CompanySubscriptionResponseData { private final String currency; private final String customerExternalId; + private final List discounts; + private final Optional expiredAt; private final String interval; @@ -43,11 +45,14 @@ public final class CompanySubscriptionResponseData { private final int totalPrice; + private final Optional trialEnd; + private final Map additionalProperties; private CompanySubscriptionResponseData( String currency, String customerExternalId, + List discounts, Optional expiredAt, String interval, Optional latestInvoice, @@ -56,9 +61,11 @@ private CompanySubscriptionResponseData( String status, String subscriptionExternalId, int totalPrice, + Optional trialEnd, Map additionalProperties) { this.currency = currency; this.customerExternalId = customerExternalId; + this.discounts = discounts; this.expiredAt = expiredAt; this.interval = interval; this.latestInvoice = latestInvoice; @@ -67,6 +74,7 @@ private CompanySubscriptionResponseData( this.status = status; this.subscriptionExternalId = subscriptionExternalId; this.totalPrice = totalPrice; + this.trialEnd = trialEnd; this.additionalProperties = additionalProperties; } @@ -80,6 +88,11 @@ public String getCustomerExternalId() { return customerExternalId; } + @JsonProperty("discounts") + public List getDiscounts() { + return discounts; + } + @JsonProperty("expired_at") public Optional getExpiredAt() { return expiredAt; @@ -120,6 +133,11 @@ public int getTotalPrice() { return totalPrice; } + @JsonProperty("trial_end") + public Optional getTrialEnd() { + return trialEnd; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -134,6 +152,7 @@ public Map getAdditionalProperties() { private boolean equalTo(CompanySubscriptionResponseData other) { return currency.equals(other.currency) && customerExternalId.equals(other.customerExternalId) + && discounts.equals(other.discounts) && expiredAt.equals(other.expiredAt) && interval.equals(other.interval) && latestInvoice.equals(other.latestInvoice) @@ -141,7 +160,8 @@ private boolean equalTo(CompanySubscriptionResponseData other) { && products.equals(other.products) && status.equals(other.status) && subscriptionExternalId.equals(other.subscriptionExternalId) - && totalPrice == other.totalPrice; + && totalPrice == other.totalPrice + && trialEnd.equals(other.trialEnd); } @java.lang.Override @@ -149,6 +169,7 @@ public int hashCode() { return Objects.hash( this.currency, this.customerExternalId, + this.discounts, this.expiredAt, this.interval, this.latestInvoice, @@ -156,7 +177,8 @@ public int hashCode() { this.products, this.status, this.subscriptionExternalId, - this.totalPrice); + this.totalPrice, + this.trialEnd); } @java.lang.Override @@ -197,6 +219,12 @@ public interface TotalPriceStage { public interface _FinalStage { CompanySubscriptionResponseData build(); + _FinalStage discounts(List discounts); + + _FinalStage addDiscounts(BillingSubscriptionDiscountView discounts); + + _FinalStage addAllDiscounts(List discounts); + _FinalStage expiredAt(Optional expiredAt); _FinalStage expiredAt(OffsetDateTime expiredAt); @@ -214,6 +242,10 @@ public interface _FinalStage { _FinalStage addProducts(BillingProductForSubscriptionResponseData products); _FinalStage addAllProducts(List products); + + _FinalStage trialEnd(Optional trialEnd); + + _FinalStage trialEnd(OffsetDateTime trialEnd); } @JsonIgnoreProperties(ignoreUnknown = true) @@ -237,6 +269,8 @@ public static final class Builder private int totalPrice; + private Optional trialEnd = Optional.empty(); + private List products = new ArrayList<>(); private Optional paymentMethod = Optional.empty(); @@ -245,6 +279,8 @@ public static final class Builder private Optional expiredAt = Optional.empty(); + private List discounts = new ArrayList<>(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -254,6 +290,7 @@ private Builder() {} public Builder from(CompanySubscriptionResponseData other) { currency(other.getCurrency()); customerExternalId(other.getCustomerExternalId()); + discounts(other.getDiscounts()); expiredAt(other.getExpiredAt()); interval(other.getInterval()); latestInvoice(other.getLatestInvoice()); @@ -262,6 +299,7 @@ public Builder from(CompanySubscriptionResponseData other) { status(other.getStatus()); subscriptionExternalId(other.getSubscriptionExternalId()); totalPrice(other.getTotalPrice()); + trialEnd(other.getTrialEnd()); return this; } @@ -307,6 +345,19 @@ public _FinalStage totalPrice(int totalPrice) { return this; } + @java.lang.Override + public _FinalStage trialEnd(OffsetDateTime trialEnd) { + this.trialEnd = Optional.ofNullable(trialEnd); + return this; + } + + @java.lang.Override + @JsonSetter(value = "trial_end", nulls = Nulls.SKIP) + public _FinalStage trialEnd(Optional trialEnd) { + this.trialEnd = trialEnd; + return this; + } + @java.lang.Override public _FinalStage addAllProducts(List products) { this.products.addAll(products); @@ -329,7 +380,7 @@ public _FinalStage products(List prod @java.lang.Override public _FinalStage paymentMethod(PaymentMethodResponseData paymentMethod) { - this.paymentMethod = Optional.of(paymentMethod); + this.paymentMethod = Optional.ofNullable(paymentMethod); return this; } @@ -342,7 +393,7 @@ public _FinalStage paymentMethod(Optional paymentMeth @java.lang.Override public _FinalStage latestInvoice(InvoiceResponseData latestInvoice) { - this.latestInvoice = Optional.of(latestInvoice); + this.latestInvoice = Optional.ofNullable(latestInvoice); return this; } @@ -355,7 +406,7 @@ public _FinalStage latestInvoice(Optional latestInvoice) { @java.lang.Override public _FinalStage expiredAt(OffsetDateTime expiredAt) { - this.expiredAt = Optional.of(expiredAt); + this.expiredAt = Optional.ofNullable(expiredAt); return this; } @@ -366,11 +417,32 @@ public _FinalStage expiredAt(Optional expiredAt) { return this; } + @java.lang.Override + public _FinalStage addAllDiscounts(List discounts) { + this.discounts.addAll(discounts); + return this; + } + + @java.lang.Override + public _FinalStage addDiscounts(BillingSubscriptionDiscountView discounts) { + this.discounts.add(discounts); + return this; + } + + @java.lang.Override + @JsonSetter(value = "discounts", nulls = Nulls.SKIP) + public _FinalStage discounts(List discounts) { + this.discounts.clear(); + this.discounts.addAll(discounts); + return this; + } + @java.lang.Override public CompanySubscriptionResponseData build() { return new CompanySubscriptionResponseData( currency, customerExternalId, + discounts, expiredAt, interval, latestInvoice, @@ -379,6 +451,7 @@ public CompanySubscriptionResponseData build() { status, subscriptionExternalId, totalPrice, + trialEnd, additionalProperties); } } diff --git a/src/main/java/com/schematic/api/types/ComponentCapabilities.java b/src/main/java/com/schematic/api/types/ComponentCapabilities.java index 0784012..220985e 100644 --- a/src/main/java/com/schematic/api/types/ComponentCapabilities.java +++ b/src/main/java/com/schematic/api/types/ComponentCapabilities.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ComponentCapabilities.Builder.class) public final class ComponentCapabilities { private final boolean checkout; diff --git a/src/main/java/com/schematic/api/types/ComponentHydrateResponseData.java b/src/main/java/com/schematic/api/types/ComponentHydrateResponseData.java index baae6b5..fef453c 100644 --- a/src/main/java/com/schematic/api/types/ComponentHydrateResponseData.java +++ b/src/main/java/com/schematic/api/types/ComponentHydrateResponseData.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ComponentHydrateResponseData.Builder.class) public final class ComponentHydrateResponseData { private final List activeAddOns; @@ -40,6 +40,8 @@ public final class ComponentHydrateResponseData { private final Optional subscription; + private final Optional trialPaymentMethodRequired; + private final Optional upcomingInvoice; private final Map additionalProperties; @@ -54,6 +56,7 @@ private ComponentHydrateResponseData( Optional featureUsage, Optional stripeEmbed, Optional subscription, + Optional trialPaymentMethodRequired, Optional upcomingInvoice, Map additionalProperties) { this.activeAddOns = activeAddOns; @@ -65,6 +68,7 @@ private ComponentHydrateResponseData( this.featureUsage = featureUsage; this.stripeEmbed = stripeEmbed; this.subscription = subscription; + this.trialPaymentMethodRequired = trialPaymentMethodRequired; this.upcomingInvoice = upcomingInvoice; this.additionalProperties = additionalProperties; } @@ -114,6 +118,11 @@ public Optional getSubscription() { return subscription; } + @JsonProperty("trial_payment_method_required") + public Optional getTrialPaymentMethodRequired() { + return trialPaymentMethodRequired; + } + @JsonProperty("upcoming_invoice") public Optional getUpcomingInvoice() { return upcomingInvoice; @@ -140,6 +149,7 @@ private boolean equalTo(ComponentHydrateResponseData other) { && featureUsage.equals(other.featureUsage) && stripeEmbed.equals(other.stripeEmbed) && subscription.equals(other.subscription) + && trialPaymentMethodRequired.equals(other.trialPaymentMethodRequired) && upcomingInvoice.equals(other.upcomingInvoice); } @@ -155,6 +165,7 @@ public int hashCode() { this.featureUsage, this.stripeEmbed, this.subscription, + this.trialPaymentMethodRequired, this.upcomingInvoice); } @@ -187,6 +198,8 @@ public static final class Builder { private Optional subscription = Optional.empty(); + private Optional trialPaymentMethodRequired = Optional.empty(); + private Optional upcomingInvoice = Optional.empty(); @JsonAnySetter @@ -204,6 +217,7 @@ public Builder from(ComponentHydrateResponseData other) { featureUsage(other.getFeatureUsage()); stripeEmbed(other.getStripeEmbed()); subscription(other.getSubscription()); + trialPaymentMethodRequired(other.getTrialPaymentMethodRequired()); upcomingInvoice(other.getUpcomingInvoice()); return this; } @@ -268,7 +282,7 @@ public Builder capabilities(Optional capabilities) { } public Builder capabilities(ComponentCapabilities capabilities) { - this.capabilities = Optional.of(capabilities); + this.capabilities = Optional.ofNullable(capabilities); return this; } @@ -279,7 +293,7 @@ public Builder company(Optional company) { } public Builder company(CompanyDetailResponseData company) { - this.company = Optional.of(company); + this.company = Optional.ofNullable(company); return this; } @@ -290,7 +304,7 @@ public Builder component(Optional component) { } public Builder component(ComponentResponseData component) { - this.component = Optional.of(component); + this.component = Optional.ofNullable(component); return this; } @@ -301,7 +315,7 @@ public Builder featureUsage(Optional featureUsag } public Builder featureUsage(FeatureUsageDetailResponseData featureUsage) { - this.featureUsage = Optional.of(featureUsage); + this.featureUsage = Optional.ofNullable(featureUsage); return this; } @@ -312,7 +326,7 @@ public Builder stripeEmbed(Optional stripeEmbed) { } public Builder stripeEmbed(StripeEmbedInfo stripeEmbed) { - this.stripeEmbed = Optional.of(stripeEmbed); + this.stripeEmbed = Optional.ofNullable(stripeEmbed); return this; } @@ -323,7 +337,18 @@ public Builder subscription(Optional subscripti } public Builder subscription(CompanySubscriptionResponseData subscription) { - this.subscription = Optional.of(subscription); + this.subscription = Optional.ofNullable(subscription); + return this; + } + + @JsonSetter(value = "trial_payment_method_required", nulls = Nulls.SKIP) + public Builder trialPaymentMethodRequired(Optional trialPaymentMethodRequired) { + this.trialPaymentMethodRequired = trialPaymentMethodRequired; + return this; + } + + public Builder trialPaymentMethodRequired(Boolean trialPaymentMethodRequired) { + this.trialPaymentMethodRequired = Optional.ofNullable(trialPaymentMethodRequired); return this; } @@ -334,7 +359,7 @@ public Builder upcomingInvoice(Optional upcomingInvoice) { } public Builder upcomingInvoice(InvoiceResponseData upcomingInvoice) { - this.upcomingInvoice = Optional.of(upcomingInvoice); + this.upcomingInvoice = Optional.ofNullable(upcomingInvoice); return this; } @@ -349,6 +374,7 @@ public ComponentHydrateResponseData build() { featureUsage, stripeEmbed, subscription, + trialPaymentMethodRequired, upcomingInvoice, additionalProperties); } diff --git a/src/main/java/com/schematic/api/types/ComponentPreviewResponseData.java b/src/main/java/com/schematic/api/types/ComponentPreviewResponseData.java index a4d4893..8b625e2 100644 --- a/src/main/java/com/schematic/api/types/ComponentPreviewResponseData.java +++ b/src/main/java/com/schematic/api/types/ComponentPreviewResponseData.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ComponentPreviewResponseData.Builder.class) public final class ComponentPreviewResponseData { private final List activeAddOns; @@ -42,6 +42,8 @@ public final class ComponentPreviewResponseData { private final Optional subscription; + private final Optional trialPaymentMethodRequired; + private final Optional upcomingInvoice; private final Map additionalProperties; @@ -57,6 +59,7 @@ private ComponentPreviewResponseData( List invoices, Optional stripeEmbed, Optional subscription, + Optional trialPaymentMethodRequired, Optional upcomingInvoice, Map additionalProperties) { this.activeAddOns = activeAddOns; @@ -69,6 +72,7 @@ private ComponentPreviewResponseData( this.invoices = invoices; this.stripeEmbed = stripeEmbed; this.subscription = subscription; + this.trialPaymentMethodRequired = trialPaymentMethodRequired; this.upcomingInvoice = upcomingInvoice; this.additionalProperties = additionalProperties; } @@ -123,6 +127,11 @@ public Optional getSubscription() { return subscription; } + @JsonProperty("trial_payment_method_required") + public Optional getTrialPaymentMethodRequired() { + return trialPaymentMethodRequired; + } + @JsonProperty("upcoming_invoice") public Optional getUpcomingInvoice() { return upcomingInvoice; @@ -150,6 +159,7 @@ private boolean equalTo(ComponentPreviewResponseData other) { && invoices.equals(other.invoices) && stripeEmbed.equals(other.stripeEmbed) && subscription.equals(other.subscription) + && trialPaymentMethodRequired.equals(other.trialPaymentMethodRequired) && upcomingInvoice.equals(other.upcomingInvoice); } @@ -166,6 +176,7 @@ public int hashCode() { this.invoices, this.stripeEmbed, this.subscription, + this.trialPaymentMethodRequired, this.upcomingInvoice); } @@ -200,6 +211,8 @@ public static final class Builder { private Optional subscription = Optional.empty(); + private Optional trialPaymentMethodRequired = Optional.empty(); + private Optional upcomingInvoice = Optional.empty(); @JsonAnySetter @@ -218,6 +231,7 @@ public Builder from(ComponentPreviewResponseData other) { invoices(other.getInvoices()); stripeEmbed(other.getStripeEmbed()); subscription(other.getSubscription()); + trialPaymentMethodRequired(other.getTrialPaymentMethodRequired()); upcomingInvoice(other.getUpcomingInvoice()); return this; } @@ -282,7 +296,7 @@ public Builder capabilities(Optional capabilities) { } public Builder capabilities(ComponentCapabilities capabilities) { - this.capabilities = Optional.of(capabilities); + this.capabilities = Optional.ofNullable(capabilities); return this; } @@ -293,7 +307,7 @@ public Builder company(Optional company) { } public Builder company(CompanyDetailResponseData company) { - this.company = Optional.of(company); + this.company = Optional.ofNullable(company); return this; } @@ -304,7 +318,7 @@ public Builder component(Optional component) { } public Builder component(ComponentResponseData component) { - this.component = Optional.of(component); + this.component = Optional.ofNullable(component); return this; } @@ -315,7 +329,7 @@ public Builder featureUsage(Optional featureUsag } public Builder featureUsage(FeatureUsageDetailResponseData featureUsage) { - this.featureUsage = Optional.of(featureUsage); + this.featureUsage = Optional.ofNullable(featureUsage); return this; } @@ -343,7 +357,7 @@ public Builder stripeEmbed(Optional stripeEmbed) { } public Builder stripeEmbed(StripeEmbedInfo stripeEmbed) { - this.stripeEmbed = Optional.of(stripeEmbed); + this.stripeEmbed = Optional.ofNullable(stripeEmbed); return this; } @@ -354,7 +368,18 @@ public Builder subscription(Optional subscripti } public Builder subscription(CompanySubscriptionResponseData subscription) { - this.subscription = Optional.of(subscription); + this.subscription = Optional.ofNullable(subscription); + return this; + } + + @JsonSetter(value = "trial_payment_method_required", nulls = Nulls.SKIP) + public Builder trialPaymentMethodRequired(Optional trialPaymentMethodRequired) { + this.trialPaymentMethodRequired = trialPaymentMethodRequired; + return this; + } + + public Builder trialPaymentMethodRequired(Boolean trialPaymentMethodRequired) { + this.trialPaymentMethodRequired = Optional.ofNullable(trialPaymentMethodRequired); return this; } @@ -365,7 +390,7 @@ public Builder upcomingInvoice(Optional upcomingInvoice) { } public Builder upcomingInvoice(InvoiceResponseData upcomingInvoice) { - this.upcomingInvoice = Optional.of(upcomingInvoice); + this.upcomingInvoice = Optional.ofNullable(upcomingInvoice); return this; } @@ -381,6 +406,7 @@ public ComponentPreviewResponseData build() { invoices, stripeEmbed, subscription, + trialPaymentMethodRequired, upcomingInvoice, additionalProperties); } diff --git a/src/main/java/com/schematic/api/types/ComponentResponseData.java b/src/main/java/com/schematic/api/types/ComponentResponseData.java index d85e728..7c98ebb 100644 --- a/src/main/java/com/schematic/api/types/ComponentResponseData.java +++ b/src/main/java/com/schematic/api/types/ComponentResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ComponentResponseData.Builder.class) public final class ComponentResponseData { private final Optional> ast; @@ -238,7 +238,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage ast(Map ast) { - this.ast = Optional.of(ast); + this.ast = Optional.ofNullable(ast); return this; } diff --git a/src/main/java/com/schematic/api/types/CountResponse.java b/src/main/java/com/schematic/api/types/CountResponse.java index 23cffe6..9f337cd 100644 --- a/src/main/java/com/schematic/api/types/CountResponse.java +++ b/src/main/java/com/schematic/api/types/CountResponse.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CountResponse.Builder.class) public final class CountResponse { private final int count; diff --git a/src/main/java/com/schematic/api/types/CouponRequestBody.java b/src/main/java/com/schematic/api/types/CouponRequestBody.java new file mode 100644 index 0000000..53cf397 --- /dev/null +++ b/src/main/java/com/schematic/api/types/CouponRequestBody.java @@ -0,0 +1,304 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = CouponRequestBody.Builder.class) +public final class CouponRequestBody { + private final int amountOff; + + private final Optional currency; + + private final String duration; + + private final int durationInMonths; + + private final int maxRedemptions; + + private final String name; + + private final double percentOff; + + private final int timesRedeemed; + + private final Map additionalProperties; + + private CouponRequestBody( + int amountOff, + Optional currency, + String duration, + int durationInMonths, + int maxRedemptions, + String name, + double percentOff, + int timesRedeemed, + Map additionalProperties) { + this.amountOff = amountOff; + this.currency = currency; + this.duration = duration; + this.durationInMonths = durationInMonths; + this.maxRedemptions = maxRedemptions; + this.name = name; + this.percentOff = percentOff; + this.timesRedeemed = timesRedeemed; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("amount_off") + public int getAmountOff() { + return amountOff; + } + + @JsonProperty("currency") + public Optional getCurrency() { + return currency; + } + + @JsonProperty("duration") + public String getDuration() { + return duration; + } + + @JsonProperty("duration_in_months") + public int getDurationInMonths() { + return durationInMonths; + } + + @JsonProperty("max_redemptions") + public int getMaxRedemptions() { + return maxRedemptions; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("percent_off") + public double getPercentOff() { + return percentOff; + } + + @JsonProperty("times_redeemed") + public int getTimesRedeemed() { + return timesRedeemed; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof CouponRequestBody && equalTo((CouponRequestBody) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(CouponRequestBody other) { + return amountOff == other.amountOff + && currency.equals(other.currency) + && duration.equals(other.duration) + && durationInMonths == other.durationInMonths + && maxRedemptions == other.maxRedemptions + && name.equals(other.name) + && percentOff == other.percentOff + && timesRedeemed == other.timesRedeemed; + } + + @java.lang.Override + public int hashCode() { + return Objects.hash( + this.amountOff, + this.currency, + this.duration, + this.durationInMonths, + this.maxRedemptions, + this.name, + this.percentOff, + this.timesRedeemed); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static AmountOffStage builder() { + return new Builder(); + } + + public interface AmountOffStage { + DurationStage amountOff(int amountOff); + + Builder from(CouponRequestBody other); + } + + public interface DurationStage { + DurationInMonthsStage duration(String duration); + } + + public interface DurationInMonthsStage { + MaxRedemptionsStage durationInMonths(int durationInMonths); + } + + public interface MaxRedemptionsStage { + NameStage maxRedemptions(int maxRedemptions); + } + + public interface NameStage { + PercentOffStage name(String name); + } + + public interface PercentOffStage { + TimesRedeemedStage percentOff(double percentOff); + } + + public interface TimesRedeemedStage { + _FinalStage timesRedeemed(int timesRedeemed); + } + + public interface _FinalStage { + CouponRequestBody build(); + + _FinalStage currency(Optional currency); + + _FinalStage currency(String currency); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder + implements AmountOffStage, + DurationStage, + DurationInMonthsStage, + MaxRedemptionsStage, + NameStage, + PercentOffStage, + TimesRedeemedStage, + _FinalStage { + private int amountOff; + + private String duration; + + private int durationInMonths; + + private int maxRedemptions; + + private String name; + + private double percentOff; + + private int timesRedeemed; + + private Optional currency = Optional.empty(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(CouponRequestBody other) { + amountOff(other.getAmountOff()); + currency(other.getCurrency()); + duration(other.getDuration()); + durationInMonths(other.getDurationInMonths()); + maxRedemptions(other.getMaxRedemptions()); + name(other.getName()); + percentOff(other.getPercentOff()); + timesRedeemed(other.getTimesRedeemed()); + return this; + } + + @java.lang.Override + @JsonSetter("amount_off") + public DurationStage amountOff(int amountOff) { + this.amountOff = amountOff; + return this; + } + + @java.lang.Override + @JsonSetter("duration") + public DurationInMonthsStage duration(String duration) { + this.duration = duration; + return this; + } + + @java.lang.Override + @JsonSetter("duration_in_months") + public MaxRedemptionsStage durationInMonths(int durationInMonths) { + this.durationInMonths = durationInMonths; + return this; + } + + @java.lang.Override + @JsonSetter("max_redemptions") + public NameStage maxRedemptions(int maxRedemptions) { + this.maxRedemptions = maxRedemptions; + return this; + } + + @java.lang.Override + @JsonSetter("name") + public PercentOffStage name(String name) { + this.name = name; + return this; + } + + @java.lang.Override + @JsonSetter("percent_off") + public TimesRedeemedStage percentOff(double percentOff) { + this.percentOff = percentOff; + return this; + } + + @java.lang.Override + @JsonSetter("times_redeemed") + public _FinalStage timesRedeemed(int timesRedeemed) { + this.timesRedeemed = timesRedeemed; + return this; + } + + @java.lang.Override + public _FinalStage currency(String currency) { + this.currency = Optional.ofNullable(currency); + return this; + } + + @java.lang.Override + @JsonSetter(value = "currency", nulls = Nulls.SKIP) + public _FinalStage currency(Optional currency) { + this.currency = currency; + return this; + } + + @java.lang.Override + public CouponRequestBody build() { + return new CouponRequestBody( + amountOff, + currency, + duration, + durationInMonths, + maxRedemptions, + name, + percentOff, + timesRedeemed, + additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/types/CreateEntitlementReqCommon.java b/src/main/java/com/schematic/api/types/CreateEntitlementReqCommon.java index c4a934d..0fe2168 100644 --- a/src/main/java/com/schematic/api/types/CreateEntitlementReqCommon.java +++ b/src/main/java/com/schematic/api/types/CreateEntitlementReqCommon.java @@ -17,15 +17,11 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateEntitlementReqCommon.Builder.class) public final class CreateEntitlementReqCommon { private final String featureId; - private final Optional meteredMonthlyPriceId; - - private final Optional meteredYearlyPriceId; - private final Optional metricPeriod; private final Optional metricPeriodMonthReset; @@ -42,8 +38,6 @@ public final class CreateEntitlementReqCommon { private CreateEntitlementReqCommon( String featureId, - Optional meteredMonthlyPriceId, - Optional meteredYearlyPriceId, Optional metricPeriod, Optional metricPeriodMonthReset, Optional valueBool, @@ -52,8 +46,6 @@ private CreateEntitlementReqCommon( CreateEntitlementReqCommonValueType valueType, Map additionalProperties) { this.featureId = featureId; - this.meteredMonthlyPriceId = meteredMonthlyPriceId; - this.meteredYearlyPriceId = meteredYearlyPriceId; this.metricPeriod = metricPeriod; this.metricPeriodMonthReset = metricPeriodMonthReset; this.valueBool = valueBool; @@ -68,16 +60,6 @@ public String getFeatureId() { return featureId; } - @JsonProperty("metered_monthly_price_id") - public Optional getMeteredMonthlyPriceId() { - return meteredMonthlyPriceId; - } - - @JsonProperty("metered_yearly_price_id") - public Optional getMeteredYearlyPriceId() { - return meteredYearlyPriceId; - } - @JsonProperty("metric_period") public Optional getMetricPeriod() { return metricPeriod; @@ -121,8 +103,6 @@ public Map getAdditionalProperties() { private boolean equalTo(CreateEntitlementReqCommon other) { return featureId.equals(other.featureId) - && meteredMonthlyPriceId.equals(other.meteredMonthlyPriceId) - && meteredYearlyPriceId.equals(other.meteredYearlyPriceId) && metricPeriod.equals(other.metricPeriod) && metricPeriodMonthReset.equals(other.metricPeriodMonthReset) && valueBool.equals(other.valueBool) @@ -135,8 +115,6 @@ private boolean equalTo(CreateEntitlementReqCommon other) { public int hashCode() { return Objects.hash( this.featureId, - this.meteredMonthlyPriceId, - this.meteredYearlyPriceId, this.metricPeriod, this.metricPeriodMonthReset, this.valueBool, @@ -167,14 +145,6 @@ public interface ValueTypeStage { public interface _FinalStage { CreateEntitlementReqCommon build(); - _FinalStage meteredMonthlyPriceId(Optional meteredMonthlyPriceId); - - _FinalStage meteredMonthlyPriceId(String meteredMonthlyPriceId); - - _FinalStage meteredYearlyPriceId(Optional meteredYearlyPriceId); - - _FinalStage meteredYearlyPriceId(String meteredYearlyPriceId); - _FinalStage metricPeriod(Optional metricPeriod); _FinalStage metricPeriod(CreateEntitlementReqCommonMetricPeriod metricPeriod); @@ -213,10 +183,6 @@ public static final class Builder implements FeatureIdStage, ValueTypeStage, _Fi private Optional metricPeriod = Optional.empty(); - private Optional meteredYearlyPriceId = Optional.empty(); - - private Optional meteredMonthlyPriceId = Optional.empty(); - @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -225,8 +191,6 @@ private Builder() {} @java.lang.Override public Builder from(CreateEntitlementReqCommon other) { featureId(other.getFeatureId()); - meteredMonthlyPriceId(other.getMeteredMonthlyPriceId()); - meteredYearlyPriceId(other.getMeteredYearlyPriceId()); metricPeriod(other.getMetricPeriod()); metricPeriodMonthReset(other.getMetricPeriodMonthReset()); valueBool(other.getValueBool()); @@ -252,7 +216,7 @@ public _FinalStage valueType(CreateEntitlementReqCommonValueType valueType) { @java.lang.Override public _FinalStage valueTraitId(String valueTraitId) { - this.valueTraitId = Optional.of(valueTraitId); + this.valueTraitId = Optional.ofNullable(valueTraitId); return this; } @@ -265,7 +229,7 @@ public _FinalStage valueTraitId(Optional valueTraitId) { @java.lang.Override public _FinalStage valueNumeric(Integer valueNumeric) { - this.valueNumeric = Optional.of(valueNumeric); + this.valueNumeric = Optional.ofNullable(valueNumeric); return this; } @@ -278,7 +242,7 @@ public _FinalStage valueNumeric(Optional valueNumeric) { @java.lang.Override public _FinalStage valueBool(Boolean valueBool) { - this.valueBool = Optional.of(valueBool); + this.valueBool = Optional.ofNullable(valueBool); return this; } @@ -292,7 +256,7 @@ public _FinalStage valueBool(Optional valueBool) { @java.lang.Override public _FinalStage metricPeriodMonthReset( CreateEntitlementReqCommonMetricPeriodMonthReset metricPeriodMonthReset) { - this.metricPeriodMonthReset = Optional.of(metricPeriodMonthReset); + this.metricPeriodMonthReset = Optional.ofNullable(metricPeriodMonthReset); return this; } @@ -306,7 +270,7 @@ public _FinalStage metricPeriodMonthReset( @java.lang.Override public _FinalStage metricPeriod(CreateEntitlementReqCommonMetricPeriod metricPeriod) { - this.metricPeriod = Optional.of(metricPeriod); + this.metricPeriod = Optional.ofNullable(metricPeriod); return this; } @@ -317,38 +281,10 @@ public _FinalStage metricPeriod(Optional return this; } - @java.lang.Override - public _FinalStage meteredYearlyPriceId(String meteredYearlyPriceId) { - this.meteredYearlyPriceId = Optional.of(meteredYearlyPriceId); - return this; - } - - @java.lang.Override - @JsonSetter(value = "metered_yearly_price_id", nulls = Nulls.SKIP) - public _FinalStage meteredYearlyPriceId(Optional meteredYearlyPriceId) { - this.meteredYearlyPriceId = meteredYearlyPriceId; - return this; - } - - @java.lang.Override - public _FinalStage meteredMonthlyPriceId(String meteredMonthlyPriceId) { - this.meteredMonthlyPriceId = Optional.of(meteredMonthlyPriceId); - return this; - } - - @java.lang.Override - @JsonSetter(value = "metered_monthly_price_id", nulls = Nulls.SKIP) - public _FinalStage meteredMonthlyPriceId(Optional meteredMonthlyPriceId) { - this.meteredMonthlyPriceId = meteredMonthlyPriceId; - return this; - } - @java.lang.Override public CreateEntitlementReqCommon build() { return new CreateEntitlementReqCommon( featureId, - meteredMonthlyPriceId, - meteredYearlyPriceId, metricPeriod, metricPeriodMonthReset, valueBool, diff --git a/src/main/java/com/schematic/api/types/CreateEntitlementReqCommonMetricPeriod.java b/src/main/java/com/schematic/api/types/CreateEntitlementReqCommonMetricPeriod.java index fb51fe2..130c46f 100644 --- a/src/main/java/com/schematic/api/types/CreateEntitlementReqCommonMetricPeriod.java +++ b/src/main/java/com/schematic/api/types/CreateEntitlementReqCommonMetricPeriod.java @@ -8,8 +8,6 @@ public enum CreateEntitlementReqCommonMetricPeriod { ALL_TIME("all_time"), - BILLING("billing"), - CURRENT_MONTH("current_month"), CURRENT_WEEK("current_week"), diff --git a/src/main/java/com/schematic/api/types/CreateEventRequestBody.java b/src/main/java/com/schematic/api/types/CreateEventRequestBody.java index da2dbc8..02a41a5 100644 --- a/src/main/java/com/schematic/api/types/CreateEventRequestBody.java +++ b/src/main/java/com/schematic/api/types/CreateEventRequestBody.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateEventRequestBody.Builder.class) public final class CreateEventRequestBody { private final Optional body; @@ -146,7 +146,7 @@ public _FinalStage eventType(CreateEventRequestBodyEventType eventType) { */ @java.lang.Override public _FinalStage sentAt(OffsetDateTime sentAt) { - this.sentAt = Optional.of(sentAt); + this.sentAt = Optional.ofNullable(sentAt); return this; } @@ -159,7 +159,7 @@ public _FinalStage sentAt(Optional sentAt) { @java.lang.Override public _FinalStage body(EventBody body) { - this.body = Optional.of(body); + this.body = Optional.ofNullable(body); return this; } diff --git a/src/main/java/com/schematic/api/types/CreateFlagRequestBody.java b/src/main/java/com/schematic/api/types/CreateFlagRequestBody.java index 3693397..a1865f3 100644 --- a/src/main/java/com/schematic/api/types/CreateFlagRequestBody.java +++ b/src/main/java/com/schematic/api/types/CreateFlagRequestBody.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateFlagRequestBody.Builder.class) public final class CreateFlagRequestBody { private final boolean defaultValue; @@ -237,7 +237,7 @@ public _FinalStage name(String name) { @java.lang.Override public _FinalStage maintainerId(String maintainerId) { - this.maintainerId = Optional.of(maintainerId); + this.maintainerId = Optional.ofNullable(maintainerId); return this; } @@ -250,7 +250,7 @@ public _FinalStage maintainerId(Optional maintainerId) { @java.lang.Override public _FinalStage featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } diff --git a/src/main/java/com/schematic/api/types/CreateOrUpdateConditionGroupRequestBody.java b/src/main/java/com/schematic/api/types/CreateOrUpdateConditionGroupRequestBody.java index 2d0526b..3aff6f7 100644 --- a/src/main/java/com/schematic/api/types/CreateOrUpdateConditionGroupRequestBody.java +++ b/src/main/java/com/schematic/api/types/CreateOrUpdateConditionGroupRequestBody.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateOrUpdateConditionGroupRequestBody.Builder.class) public final class CreateOrUpdateConditionGroupRequestBody { private final List conditions; @@ -145,7 +145,7 @@ public Builder flagId(Optional flagId) { } public Builder flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } @@ -156,7 +156,7 @@ public Builder id(Optional id) { } public Builder id(String id) { - this.id = Optional.of(id); + this.id = Optional.ofNullable(id); return this; } @@ -167,7 +167,7 @@ public Builder planId(Optional planId) { } public Builder planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } diff --git a/src/main/java/com/schematic/api/types/CreateOrUpdateConditionRequestBody.java b/src/main/java/com/schematic/api/types/CreateOrUpdateConditionRequestBody.java index a7d79d3..e0cb5d8 100644 --- a/src/main/java/com/schematic/api/types/CreateOrUpdateConditionRequestBody.java +++ b/src/main/java/com/schematic/api/types/CreateOrUpdateConditionRequestBody.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateOrUpdateConditionRequestBody.Builder.class) public final class CreateOrUpdateConditionRequestBody { private final Optional comparisonTraitId; @@ -323,7 +323,7 @@ public _FinalStage operator(CreateOrUpdateConditionRequestBodyOperator operator) */ @java.lang.Override public _FinalStage traitValue(String traitValue) { - this.traitValue = Optional.of(traitValue); + this.traitValue = Optional.ofNullable(traitValue); return this; } @@ -340,7 +340,7 @@ public _FinalStage traitValue(Optional traitValue) { */ @java.lang.Override public _FinalStage traitId(String traitId) { - this.traitId = Optional.of(traitId); + this.traitId = Optional.ofNullable(traitId); return this; } @@ -385,7 +385,7 @@ public _FinalStage resourceIds(List resourceIds) { */ @java.lang.Override public _FinalStage metricValue(Integer metricValue) { - this.metricValue = Optional.of(metricValue); + this.metricValue = Optional.ofNullable(metricValue); return this; } @@ -403,7 +403,7 @@ public _FinalStage metricValue(Optional metricValue) { @java.lang.Override public _FinalStage metricPeriodMonthReset( CreateOrUpdateConditionRequestBodyMetricPeriodMonthReset metricPeriodMonthReset) { - this.metricPeriodMonthReset = Optional.of(metricPeriodMonthReset); + this.metricPeriodMonthReset = Optional.ofNullable(metricPeriodMonthReset); return this; } @@ -421,7 +421,7 @@ public _FinalStage metricPeriodMonthReset( */ @java.lang.Override public _FinalStage metricPeriod(CreateOrUpdateConditionRequestBodyMetricPeriod metricPeriod) { - this.metricPeriod = Optional.of(metricPeriod); + this.metricPeriod = Optional.ofNullable(metricPeriod); return this; } @@ -434,7 +434,7 @@ public _FinalStage metricPeriod(Optional id) { */ @java.lang.Override public _FinalStage eventSubtype(String eventSubtype) { - this.eventSubtype = Optional.of(eventSubtype); + this.eventSubtype = Optional.ofNullable(eventSubtype); return this; } @@ -468,7 +468,7 @@ public _FinalStage eventSubtype(Optional eventSubtype) { */ @java.lang.Override public _FinalStage comparisonTraitId(String comparisonTraitId) { - this.comparisonTraitId = Optional.of(comparisonTraitId); + this.comparisonTraitId = Optional.ofNullable(comparisonTraitId); return this; } diff --git a/src/main/java/com/schematic/api/types/CreateOrUpdateConditionRequestBodyMetricPeriod.java b/src/main/java/com/schematic/api/types/CreateOrUpdateConditionRequestBodyMetricPeriod.java index bc9ee60..9cef5b5 100644 --- a/src/main/java/com/schematic/api/types/CreateOrUpdateConditionRequestBodyMetricPeriod.java +++ b/src/main/java/com/schematic/api/types/CreateOrUpdateConditionRequestBodyMetricPeriod.java @@ -8,8 +8,6 @@ public enum CreateOrUpdateConditionRequestBodyMetricPeriod { ALL_TIME("all_time"), - BILLING("billing"), - CURRENT_MONTH("current_month"), CURRENT_WEEK("current_week"), diff --git a/src/main/java/com/schematic/api/types/CreateOrUpdateFlagRequestBody.java b/src/main/java/com/schematic/api/types/CreateOrUpdateFlagRequestBody.java index 79e4a23..d8f001f 100644 --- a/src/main/java/com/schematic/api/types/CreateOrUpdateFlagRequestBody.java +++ b/src/main/java/com/schematic/api/types/CreateOrUpdateFlagRequestBody.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateOrUpdateFlagRequestBody.Builder.class) public final class CreateOrUpdateFlagRequestBody { private final boolean defaultValue; @@ -255,7 +255,7 @@ public _FinalStage name(String name) { @java.lang.Override public _FinalStage maintainerId(String maintainerId) { - this.maintainerId = Optional.of(maintainerId); + this.maintainerId = Optional.ofNullable(maintainerId); return this; } @@ -268,7 +268,7 @@ public _FinalStage maintainerId(Optional maintainerId) { @java.lang.Override public _FinalStage id(String id) { - this.id = Optional.of(id); + this.id = Optional.ofNullable(id); return this; } @@ -281,7 +281,7 @@ public _FinalStage id(Optional id) { @java.lang.Override public _FinalStage featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } diff --git a/src/main/java/com/schematic/api/types/CreateOrUpdateRuleRequestBody.java b/src/main/java/com/schematic/api/types/CreateOrUpdateRuleRequestBody.java index 8bf1423..82131b9 100644 --- a/src/main/java/com/schematic/api/types/CreateOrUpdateRuleRequestBody.java +++ b/src/main/java/com/schematic/api/types/CreateOrUpdateRuleRequestBody.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateOrUpdateRuleRequestBody.Builder.class) public final class CreateOrUpdateRuleRequestBody { private final List conditionGroups; @@ -222,7 +222,7 @@ public _FinalStage value(boolean value) { @java.lang.Override public _FinalStage ruleType(CreateOrUpdateRuleRequestBodyRuleType ruleType) { - this.ruleType = Optional.of(ruleType); + this.ruleType = Optional.ofNullable(ruleType); return this; } @@ -235,7 +235,7 @@ public _FinalStage ruleType(Optional rule @java.lang.Override public _FinalStage id(String id) { - this.id = Optional.of(id); + this.id = Optional.ofNullable(id); return this; } diff --git a/src/main/java/com/schematic/api/types/CrmDealLineItem.java b/src/main/java/com/schematic/api/types/CrmDealLineItem.java index dc0a2bf..a5d28cb 100644 --- a/src/main/java/com/schematic/api/types/CrmDealLineItem.java +++ b/src/main/java/com/schematic/api/types/CrmDealLineItem.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CrmDealLineItem.Builder.class) public final class CrmDealLineItem { private final String billingFrequency; @@ -366,7 +366,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage totalDiscount(Map totalDiscount) { - this.totalDiscount = Optional.of(totalDiscount); + this.totalDiscount = Optional.ofNullable(totalDiscount); return this; } @@ -379,7 +379,7 @@ public _FinalStage totalDiscount(Optional> totalDiscount) @java.lang.Override public _FinalStage termMonth(Integer termMonth) { - this.termMonth = Optional.of(termMonth); + this.termMonth = Optional.ofNullable(termMonth); return this; } @@ -392,7 +392,7 @@ public _FinalStage termMonth(Optional termMonth) { @java.lang.Override public _FinalStage discountPercentage(Map discountPercentage) { - this.discountPercentage = Optional.of(discountPercentage); + this.discountPercentage = Optional.ofNullable(discountPercentage); return this; } diff --git a/src/main/java/com/schematic/api/types/CrmDealResponseData.java b/src/main/java/com/schematic/api/types/CrmDealResponseData.java index c4c4d0e..a601e62 100644 --- a/src/main/java/com/schematic/api/types/CrmDealResponseData.java +++ b/src/main/java/com/schematic/api/types/CrmDealResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CrmDealResponseData.Builder.class) public final class CrmDealResponseData { private final String accountId; @@ -339,7 +339,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage productExternalId(String productExternalId) { - this.productExternalId = Optional.of(productExternalId); + this.productExternalId = Optional.ofNullable(productExternalId); return this; } @@ -352,7 +352,7 @@ public _FinalStage productExternalId(Optional productExternalId) { @java.lang.Override public _FinalStage name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -365,7 +365,7 @@ public _FinalStage name(Optional name) { @java.lang.Override public _FinalStage companyExternalId(String companyExternalId) { - this.companyExternalId = Optional.of(companyExternalId); + this.companyExternalId = Optional.ofNullable(companyExternalId); return this; } diff --git a/src/main/java/com/schematic/api/types/CrmLineItemResponseData.java b/src/main/java/com/schematic/api/types/CrmLineItemResponseData.java index 1ad48f5..e5908db 100644 --- a/src/main/java/com/schematic/api/types/CrmLineItemResponseData.java +++ b/src/main/java/com/schematic/api/types/CrmLineItemResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CrmLineItemResponseData.Builder.class) public final class CrmLineItemResponseData { private final String accountId; @@ -213,7 +213,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage productExternalId(String productExternalId) { - this.productExternalId = Optional.of(productExternalId); + this.productExternalId = Optional.ofNullable(productExternalId); return this; } @@ -226,7 +226,7 @@ public _FinalStage productExternalId(Optional productExternalId) { @java.lang.Override public _FinalStage dealId(String dealId) { - this.dealId = Optional.of(dealId); + this.dealId = Optional.ofNullable(dealId); return this; } diff --git a/src/main/java/com/schematic/api/types/CrmProductResponseData.java b/src/main/java/com/schematic/api/types/CrmProductResponseData.java index c0ab04a..94d99ac 100644 --- a/src/main/java/com/schematic/api/types/CrmProductResponseData.java +++ b/src/main/java/com/schematic/api/types/CrmProductResponseData.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CrmProductResponseData.Builder.class) public final class CrmProductResponseData { private final String accountId; diff --git a/src/main/java/com/schematic/api/types/DeleteResponse.java b/src/main/java/com/schematic/api/types/DeleteResponse.java index 3e3c75f..1970414 100644 --- a/src/main/java/com/schematic/api/types/DeleteResponse.java +++ b/src/main/java/com/schematic/api/types/DeleteResponse.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = DeleteResponse.Builder.class) public final class DeleteResponse { private final Optional deleted; @@ -87,7 +87,7 @@ public Builder deleted(Optional deleted) { } public Builder deleted(Boolean deleted) { - this.deleted = Optional.of(deleted); + this.deleted = Optional.ofNullable(deleted); return this; } diff --git a/src/main/java/com/schematic/api/types/EntityKeyDefinitionResponseData.java b/src/main/java/com/schematic/api/types/EntityKeyDefinitionResponseData.java index d246696..b29f93e 100644 --- a/src/main/java/com/schematic/api/types/EntityKeyDefinitionResponseData.java +++ b/src/main/java/com/schematic/api/types/EntityKeyDefinitionResponseData.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EntityKeyDefinitionResponseData.Builder.class) public final class EntityKeyDefinitionResponseData { private final OffsetDateTime createdAt; diff --git a/src/main/java/com/schematic/api/types/EntityKeyDetailResponseData.java b/src/main/java/com/schematic/api/types/EntityKeyDetailResponseData.java index 3b4358d..4cd59c3 100644 --- a/src/main/java/com/schematic/api/types/EntityKeyDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/EntityKeyDetailResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EntityKeyDetailResponseData.Builder.class) public final class EntityKeyDetailResponseData { private final OffsetDateTime createdAt; @@ -329,7 +329,7 @@ public _FinalStage value(String value) { @java.lang.Override public _FinalStage definition(EntityKeyDefinitionResponseData definition) { - this.definition = Optional.of(definition); + this.definition = Optional.ofNullable(definition); return this; } diff --git a/src/main/java/com/schematic/api/types/EntityKeyResponseData.java b/src/main/java/com/schematic/api/types/EntityKeyResponseData.java index 3334298..7bddf4a 100644 --- a/src/main/java/com/schematic/api/types/EntityKeyResponseData.java +++ b/src/main/java/com/schematic/api/types/EntityKeyResponseData.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EntityKeyResponseData.Builder.class) public final class EntityKeyResponseData { private final OffsetDateTime createdAt; diff --git a/src/main/java/com/schematic/api/types/EntityTraitDefinitionResponseData.java b/src/main/java/com/schematic/api/types/EntityTraitDefinitionResponseData.java index 4fc1547..95b7064 100644 --- a/src/main/java/com/schematic/api/types/EntityTraitDefinitionResponseData.java +++ b/src/main/java/com/schematic/api/types/EntityTraitDefinitionResponseData.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EntityTraitDefinitionResponseData.Builder.class) public final class EntityTraitDefinitionResponseData { private final OffsetDateTime createdAt; diff --git a/src/main/java/com/schematic/api/types/EntityTraitDetailResponseData.java b/src/main/java/com/schematic/api/types/EntityTraitDetailResponseData.java index 28d3887..6a504bc 100644 --- a/src/main/java/com/schematic/api/types/EntityTraitDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/EntityTraitDetailResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EntityTraitDetailResponseData.Builder.class) public final class EntityTraitDetailResponseData { private final OffsetDateTime createdAt; @@ -251,7 +251,7 @@ public _FinalStage value(String value) { @java.lang.Override public _FinalStage definition(EntityTraitDefinitionResponseData definition) { - this.definition = Optional.of(definition); + this.definition = Optional.ofNullable(definition); return this; } diff --git a/src/main/java/com/schematic/api/types/EntityTraitResponseData.java b/src/main/java/com/schematic/api/types/EntityTraitResponseData.java index b3c63e9..bc2fc87 100644 --- a/src/main/java/com/schematic/api/types/EntityTraitResponseData.java +++ b/src/main/java/com/schematic/api/types/EntityTraitResponseData.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EntityTraitResponseData.Builder.class) public final class EntityTraitResponseData { private final OffsetDateTime createdAt; diff --git a/src/main/java/com/schematic/api/types/EntityTraitValue.java b/src/main/java/com/schematic/api/types/EntityTraitValue.java index d187841..8cdbacd 100644 --- a/src/main/java/com/schematic/api/types/EntityTraitValue.java +++ b/src/main/java/com/schematic/api/types/EntityTraitValue.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EntityTraitValue.Builder.class) public final class EntityTraitValue { private final String definitionId; diff --git a/src/main/java/com/schematic/api/types/EnvironmentDetailResponseData.java b/src/main/java/com/schematic/api/types/EnvironmentDetailResponseData.java index 2b3b278..0fdad3b 100644 --- a/src/main/java/com/schematic/api/types/EnvironmentDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/EnvironmentDetailResponseData.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EnvironmentDetailResponseData.Builder.class) public final class EnvironmentDetailResponseData { private final List apiKeys; diff --git a/src/main/java/com/schematic/api/types/EnvironmentResponseData.java b/src/main/java/com/schematic/api/types/EnvironmentResponseData.java index 8b1f2fc..79d5dc2 100644 --- a/src/main/java/com/schematic/api/types/EnvironmentResponseData.java +++ b/src/main/java/com/schematic/api/types/EnvironmentResponseData.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EnvironmentResponseData.Builder.class) public final class EnvironmentResponseData { private final OffsetDateTime createdAt; diff --git a/src/main/java/com/schematic/api/types/EventBodyFlagCheck.java b/src/main/java/com/schematic/api/types/EventBodyFlagCheck.java index d94e007..f43119b 100644 --- a/src/main/java/com/schematic/api/types/EventBodyFlagCheck.java +++ b/src/main/java/com/schematic/api/types/EventBodyFlagCheck.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EventBodyFlagCheck.Builder.class) public final class EventBodyFlagCheck { private final Optional companyId; @@ -322,7 +322,7 @@ public _FinalStage value(boolean value) { */ @java.lang.Override public _FinalStage userId(String userId) { - this.userId = Optional.of(userId); + this.userId = Optional.ofNullable(userId); return this; } @@ -339,7 +339,7 @@ public _FinalStage userId(Optional userId) { */ @java.lang.Override public _FinalStage ruleId(String ruleId) { - this.ruleId = Optional.of(ruleId); + this.ruleId = Optional.ofNullable(ruleId); return this; } @@ -356,7 +356,7 @@ public _FinalStage ruleId(Optional ruleId) { */ @java.lang.Override public _FinalStage reqUser(Map reqUser) { - this.reqUser = Optional.of(reqUser); + this.reqUser = Optional.ofNullable(reqUser); return this; } @@ -373,7 +373,7 @@ public _FinalStage reqUser(Optional> reqUser) { */ @java.lang.Override public _FinalStage reqCompany(Map reqCompany) { - this.reqCompany = Optional.of(reqCompany); + this.reqCompany = Optional.ofNullable(reqCompany); return this; } @@ -390,7 +390,7 @@ public _FinalStage reqCompany(Optional> reqCompany) { */ @java.lang.Override public _FinalStage flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } @@ -407,7 +407,7 @@ public _FinalStage flagId(Optional flagId) { */ @java.lang.Override public _FinalStage error(String error) { - this.error = Optional.of(error); + this.error = Optional.ofNullable(error); return this; } @@ -424,7 +424,7 @@ public _FinalStage error(Optional error) { */ @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } diff --git a/src/main/java/com/schematic/api/types/EventBodyIdentify.java b/src/main/java/com/schematic/api/types/EventBodyIdentify.java index 52c4633..f173366 100644 --- a/src/main/java/com/schematic/api/types/EventBodyIdentify.java +++ b/src/main/java/com/schematic/api/types/EventBodyIdentify.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EventBodyIdentify.Builder.class) public final class EventBodyIdentify { private final Optional company; @@ -139,7 +139,7 @@ public Builder company(Optional company) { } public Builder company(EventBodyIdentifyCompany company) { - this.company = Optional.of(company); + this.company = Optional.ofNullable(company); return this; } @@ -167,7 +167,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -178,7 +178,7 @@ public Builder traits(Optional> traits) { } public Builder traits(Map traits) { - this.traits = Optional.of(traits); + this.traits = Optional.ofNullable(traits); return this; } diff --git a/src/main/java/com/schematic/api/types/EventBodyIdentifyCompany.java b/src/main/java/com/schematic/api/types/EventBodyIdentifyCompany.java index 64d0056..40ac5c3 100644 --- a/src/main/java/com/schematic/api/types/EventBodyIdentifyCompany.java +++ b/src/main/java/com/schematic/api/types/EventBodyIdentifyCompany.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EventBodyIdentifyCompany.Builder.class) public final class EventBodyIdentifyCompany { private final Map keys; @@ -138,7 +138,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -149,7 +149,7 @@ public Builder traits(Optional> traits) { } public Builder traits(Map traits) { - this.traits = Optional.of(traits); + this.traits = Optional.ofNullable(traits); return this; } diff --git a/src/main/java/com/schematic/api/types/EventBodyTrack.java b/src/main/java/com/schematic/api/types/EventBodyTrack.java index 771d658..a124a68 100644 --- a/src/main/java/com/schematic/api/types/EventBodyTrack.java +++ b/src/main/java/com/schematic/api/types/EventBodyTrack.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EventBodyTrack.Builder.class) public final class EventBodyTrack { private final Optional> company; @@ -171,7 +171,7 @@ public _FinalStage event(String event) { */ @java.lang.Override public _FinalStage user(Map user) { - this.user = Optional.of(user); + this.user = Optional.ofNullable(user); return this; } @@ -188,7 +188,7 @@ public _FinalStage user(Optional> user) { */ @java.lang.Override public _FinalStage traits(Map traits) { - this.traits = Optional.of(traits); + this.traits = Optional.ofNullable(traits); return this; } @@ -205,7 +205,7 @@ public _FinalStage traits(Optional> traits) { */ @java.lang.Override public _FinalStage company(Map company) { - this.company = Optional.of(company); + this.company = Optional.ofNullable(company); return this; } diff --git a/src/main/java/com/schematic/api/types/EventDetailResponseData.java b/src/main/java/com/schematic/api/types/EventDetailResponseData.java index ce4117f..8f736b5 100644 --- a/src/main/java/com/schematic/api/types/EventDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/EventDetailResponseData.java @@ -22,7 +22,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EventDetailResponseData.Builder.class) public final class EventDetailResponseData { private final Optional apiKey; @@ -507,7 +507,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage userId(String userId) { - this.userId = Optional.of(userId); + this.userId = Optional.ofNullable(userId); return this; } @@ -520,7 +520,7 @@ public _FinalStage userId(Optional userId) { @java.lang.Override public _FinalStage user(PreviewObject user) { - this.user = Optional.of(user); + this.user = Optional.ofNullable(user); return this; } @@ -533,7 +533,7 @@ public _FinalStage user(Optional user) { @java.lang.Override public _FinalStage subtype(String subtype) { - this.subtype = Optional.of(subtype); + this.subtype = Optional.ofNullable(subtype); return this; } @@ -546,7 +546,7 @@ public _FinalStage subtype(Optional subtype) { @java.lang.Override public _FinalStage sentAt(OffsetDateTime sentAt) { - this.sentAt = Optional.of(sentAt); + this.sentAt = Optional.ofNullable(sentAt); return this; } @@ -559,7 +559,7 @@ public _FinalStage sentAt(Optional sentAt) { @java.lang.Override public _FinalStage processedAt(OffsetDateTime processedAt) { - this.processedAt = Optional.of(processedAt); + this.processedAt = Optional.ofNullable(processedAt); return this; } @@ -572,7 +572,7 @@ public _FinalStage processedAt(Optional processedAt) { @java.lang.Override public _FinalStage loadedAt(OffsetDateTime loadedAt) { - this.loadedAt = Optional.of(loadedAt); + this.loadedAt = Optional.ofNullable(loadedAt); return this; } @@ -625,7 +625,7 @@ public _FinalStage featureIds(List featureIds) { @java.lang.Override public _FinalStage errorMessage(String errorMessage) { - this.errorMessage = Optional.of(errorMessage); + this.errorMessage = Optional.ofNullable(errorMessage); return this; } @@ -638,7 +638,7 @@ public _FinalStage errorMessage(Optional errorMessage) { @java.lang.Override public _FinalStage environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -651,7 +651,7 @@ public _FinalStage environmentId(Optional environmentId) { @java.lang.Override public _FinalStage enrichedAt(OffsetDateTime enrichedAt) { - this.enrichedAt = Optional.of(enrichedAt); + this.enrichedAt = Optional.ofNullable(enrichedAt); return this; } @@ -664,7 +664,7 @@ public _FinalStage enrichedAt(Optional enrichedAt) { @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -677,7 +677,7 @@ public _FinalStage companyId(Optional companyId) { @java.lang.Override public _FinalStage company(PreviewObject company) { - this.company = Optional.of(company); + this.company = Optional.ofNullable(company); return this; } @@ -710,7 +710,7 @@ public _FinalStage body(Map body) { @java.lang.Override public _FinalStage apiKey(String apiKey) { - this.apiKey = Optional.of(apiKey); + this.apiKey = Optional.ofNullable(apiKey); return this; } diff --git a/src/main/java/com/schematic/api/types/EventResponseData.java b/src/main/java/com/schematic/api/types/EventResponseData.java index 97b9e7f..66e096b 100644 --- a/src/main/java/com/schematic/api/types/EventResponseData.java +++ b/src/main/java/com/schematic/api/types/EventResponseData.java @@ -22,7 +22,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EventResponseData.Builder.class) public final class EventResponseData { private final Optional apiKey; @@ -451,7 +451,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage userId(String userId) { - this.userId = Optional.of(userId); + this.userId = Optional.ofNullable(userId); return this; } @@ -464,7 +464,7 @@ public _FinalStage userId(Optional userId) { @java.lang.Override public _FinalStage subtype(String subtype) { - this.subtype = Optional.of(subtype); + this.subtype = Optional.ofNullable(subtype); return this; } @@ -477,7 +477,7 @@ public _FinalStage subtype(Optional subtype) { @java.lang.Override public _FinalStage sentAt(OffsetDateTime sentAt) { - this.sentAt = Optional.of(sentAt); + this.sentAt = Optional.ofNullable(sentAt); return this; } @@ -490,7 +490,7 @@ public _FinalStage sentAt(Optional sentAt) { @java.lang.Override public _FinalStage processedAt(OffsetDateTime processedAt) { - this.processedAt = Optional.of(processedAt); + this.processedAt = Optional.ofNullable(processedAt); return this; } @@ -503,7 +503,7 @@ public _FinalStage processedAt(Optional processedAt) { @java.lang.Override public _FinalStage loadedAt(OffsetDateTime loadedAt) { - this.loadedAt = Optional.of(loadedAt); + this.loadedAt = Optional.ofNullable(loadedAt); return this; } @@ -536,7 +536,7 @@ public _FinalStage featureIds(List featureIds) { @java.lang.Override public _FinalStage errorMessage(String errorMessage) { - this.errorMessage = Optional.of(errorMessage); + this.errorMessage = Optional.ofNullable(errorMessage); return this; } @@ -549,7 +549,7 @@ public _FinalStage errorMessage(Optional errorMessage) { @java.lang.Override public _FinalStage environmentId(String environmentId) { - this.environmentId = Optional.of(environmentId); + this.environmentId = Optional.ofNullable(environmentId); return this; } @@ -562,7 +562,7 @@ public _FinalStage environmentId(Optional environmentId) { @java.lang.Override public _FinalStage enrichedAt(OffsetDateTime enrichedAt) { - this.enrichedAt = Optional.of(enrichedAt); + this.enrichedAt = Optional.ofNullable(enrichedAt); return this; } @@ -575,7 +575,7 @@ public _FinalStage enrichedAt(Optional enrichedAt) { @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -608,7 +608,7 @@ public _FinalStage body(Map body) { @java.lang.Override public _FinalStage apiKey(String apiKey) { - this.apiKey = Optional.of(apiKey); + this.apiKey = Optional.ofNullable(apiKey); return this; } diff --git a/src/main/java/com/schematic/api/types/EventSummaryResponseData.java b/src/main/java/com/schematic/api/types/EventSummaryResponseData.java index da4739d..d54a6f3 100644 --- a/src/main/java/com/schematic/api/types/EventSummaryResponseData.java +++ b/src/main/java/com/schematic/api/types/EventSummaryResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = EventSummaryResponseData.Builder.class) public final class EventSummaryResponseData { private final int companyCount; @@ -225,7 +225,7 @@ public _FinalStage userCount(int userCount) { @java.lang.Override public _FinalStage lastSeenAt(OffsetDateTime lastSeenAt) { - this.lastSeenAt = Optional.of(lastSeenAt); + this.lastSeenAt = Optional.ofNullable(lastSeenAt); return this; } diff --git a/src/main/java/com/schematic/api/types/FeatureCompanyResponseData.java b/src/main/java/com/schematic/api/types/FeatureCompanyResponseData.java index 6096fa5..85f78ca 100644 --- a/src/main/java/com/schematic/api/types/FeatureCompanyResponseData.java +++ b/src/main/java/com/schematic/api/types/FeatureCompanyResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = FeatureCompanyResponseData.Builder.class) public final class FeatureCompanyResponseData { private final boolean access; @@ -372,7 +372,7 @@ public _FinalStage entitlementType(String entitlementType) { */ @java.lang.Override public _FinalStage usage(Integer usage) { - this.usage = Optional.of(usage); + this.usage = Optional.ofNullable(usage); return this; } @@ -385,7 +385,7 @@ public _FinalStage usage(Optional usage) { @java.lang.Override public _FinalStage plan(PlanResponseData plan) { - this.plan = Optional.of(plan); + this.plan = Optional.ofNullable(plan); return this; } @@ -402,7 +402,7 @@ public _FinalStage plan(Optional plan) { */ @java.lang.Override public _FinalStage period(String period) { - this.period = Optional.of(period); + this.period = Optional.ofNullable(period); return this; } @@ -419,7 +419,7 @@ public _FinalStage period(Optional period) { */ @java.lang.Override public _FinalStage monthReset(String monthReset) { - this.monthReset = Optional.of(monthReset); + this.monthReset = Optional.ofNullable(monthReset); return this; } @@ -436,7 +436,7 @@ public _FinalStage monthReset(Optional monthReset) { */ @java.lang.Override public _FinalStage metricResetAt(OffsetDateTime metricResetAt) { - this.metricResetAt = Optional.of(metricResetAt); + this.metricResetAt = Optional.ofNullable(metricResetAt); return this; } @@ -449,7 +449,7 @@ public _FinalStage metricResetAt(Optional metricResetAt) { @java.lang.Override public _FinalStage feature(FeatureDetailResponseData feature) { - this.feature = Optional.of(feature); + this.feature = Optional.ofNullable(feature); return this; } @@ -462,7 +462,7 @@ public _FinalStage feature(Optional feature) { @java.lang.Override public _FinalStage entitlementExpirationDate(OffsetDateTime entitlementExpirationDate) { - this.entitlementExpirationDate = Optional.of(entitlementExpirationDate); + this.entitlementExpirationDate = Optional.ofNullable(entitlementExpirationDate); return this; } @@ -475,7 +475,7 @@ public _FinalStage entitlementExpirationDate(Optional entitlemen @java.lang.Override public _FinalStage company(CompanyDetailResponseData company) { - this.company = Optional.of(company); + this.company = Optional.ofNullable(company); return this; } @@ -492,7 +492,7 @@ public _FinalStage company(Optional company) { */ @java.lang.Override public _FinalStage allocation(Integer allocation) { - this.allocation = Optional.of(allocation); + this.allocation = Optional.ofNullable(allocation); return this; } diff --git a/src/main/java/com/schematic/api/types/FeatureCompanyUserResponseData.java b/src/main/java/com/schematic/api/types/FeatureCompanyUserResponseData.java index 04c0b23..3830e99 100644 --- a/src/main/java/com/schematic/api/types/FeatureCompanyUserResponseData.java +++ b/src/main/java/com/schematic/api/types/FeatureCompanyUserResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = FeatureCompanyUserResponseData.Builder.class) public final class FeatureCompanyUserResponseData { private final boolean access; @@ -368,7 +368,7 @@ public _FinalStage entitlementType(String entitlementType) { @java.lang.Override public _FinalStage user(UserResponseData user) { - this.user = Optional.of(user); + this.user = Optional.ofNullable(user); return this; } @@ -385,7 +385,7 @@ public _FinalStage user(Optional user) { */ @java.lang.Override public _FinalStage usage(Integer usage) { - this.usage = Optional.of(usage); + this.usage = Optional.ofNullable(usage); return this; } @@ -398,7 +398,7 @@ public _FinalStage usage(Optional usage) { @java.lang.Override public _FinalStage plan(PlanResponseData plan) { - this.plan = Optional.of(plan); + this.plan = Optional.ofNullable(plan); return this; } @@ -415,7 +415,7 @@ public _FinalStage plan(Optional plan) { */ @java.lang.Override public _FinalStage period(String period) { - this.period = Optional.of(period); + this.period = Optional.ofNullable(period); return this; } @@ -432,7 +432,7 @@ public _FinalStage period(Optional period) { */ @java.lang.Override public _FinalStage monthReset(String monthReset) { - this.monthReset = Optional.of(monthReset); + this.monthReset = Optional.ofNullable(monthReset); return this; } @@ -449,7 +449,7 @@ public _FinalStage monthReset(Optional monthReset) { */ @java.lang.Override public _FinalStage metricResetAt(OffsetDateTime metricResetAt) { - this.metricResetAt = Optional.of(metricResetAt); + this.metricResetAt = Optional.ofNullable(metricResetAt); return this; } @@ -462,7 +462,7 @@ public _FinalStage metricResetAt(Optional metricResetAt) { @java.lang.Override public _FinalStage feature(FeatureDetailResponseData feature) { - this.feature = Optional.of(feature); + this.feature = Optional.ofNullable(feature); return this; } @@ -475,7 +475,7 @@ public _FinalStage feature(Optional feature) { @java.lang.Override public _FinalStage company(CompanyDetailResponseData company) { - this.company = Optional.of(company); + this.company = Optional.ofNullable(company); return this; } @@ -492,7 +492,7 @@ public _FinalStage company(Optional company) { */ @java.lang.Override public _FinalStage allocation(Integer allocation) { - this.allocation = Optional.of(allocation); + this.allocation = Optional.ofNullable(allocation); return this; } diff --git a/src/main/java/com/schematic/api/types/FeatureDetailResponseData.java b/src/main/java/com/schematic/api/types/FeatureDetailResponseData.java index 562e264..1ee8811 100644 --- a/src/main/java/com/schematic/api/types/FeatureDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/FeatureDetailResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = FeatureDetailResponseData.Builder.class) public final class FeatureDetailResponseData { private final OffsetDateTime createdAt; @@ -409,7 +409,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage traitId(String traitId) { - this.traitId = Optional.of(traitId); + this.traitId = Optional.ofNullable(traitId); return this; } @@ -422,7 +422,7 @@ public _FinalStage traitId(Optional traitId) { @java.lang.Override public _FinalStage trait(EntityTraitDefinitionResponseData trait) { - this.trait = Optional.of(trait); + this.trait = Optional.ofNullable(trait); return this; } @@ -455,7 +455,7 @@ public _FinalStage plans(List plans) { @java.lang.Override public _FinalStage maintainerId(String maintainerId) { - this.maintainerId = Optional.of(maintainerId); + this.maintainerId = Optional.ofNullable(maintainerId); return this; } @@ -468,7 +468,7 @@ public _FinalStage maintainerId(Optional maintainerId) { @java.lang.Override public _FinalStage lifecyclePhase(String lifecyclePhase) { - this.lifecyclePhase = Optional.of(lifecyclePhase); + this.lifecyclePhase = Optional.ofNullable(lifecyclePhase); return this; } @@ -501,7 +501,7 @@ public _FinalStage flags(List flags) { @java.lang.Override public _FinalStage eventSummary(EventSummaryResponseData eventSummary) { - this.eventSummary = Optional.of(eventSummary); + this.eventSummary = Optional.ofNullable(eventSummary); return this; } @@ -514,7 +514,7 @@ public _FinalStage eventSummary(Optional eventSummary) @java.lang.Override public _FinalStage eventSubtype(String eventSubtype) { - this.eventSubtype = Optional.of(eventSubtype); + this.eventSubtype = Optional.ofNullable(eventSubtype); return this; } diff --git a/src/main/java/com/schematic/api/types/FeatureResponseData.java b/src/main/java/com/schematic/api/types/FeatureResponseData.java index 60b1d51..9b15f3c 100644 --- a/src/main/java/com/schematic/api/types/FeatureResponseData.java +++ b/src/main/java/com/schematic/api/types/FeatureResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = FeatureResponseData.Builder.class) public final class FeatureResponseData { private final OffsetDateTime createdAt; @@ -331,7 +331,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage traitId(String traitId) { - this.traitId = Optional.of(traitId); + this.traitId = Optional.ofNullable(traitId); return this; } @@ -344,7 +344,7 @@ public _FinalStage traitId(Optional traitId) { @java.lang.Override public _FinalStage maintainerId(String maintainerId) { - this.maintainerId = Optional.of(maintainerId); + this.maintainerId = Optional.ofNullable(maintainerId); return this; } @@ -357,7 +357,7 @@ public _FinalStage maintainerId(Optional maintainerId) { @java.lang.Override public _FinalStage lifecyclePhase(String lifecyclePhase) { - this.lifecyclePhase = Optional.of(lifecyclePhase); + this.lifecyclePhase = Optional.ofNullable(lifecyclePhase); return this; } @@ -370,7 +370,7 @@ public _FinalStage lifecyclePhase(Optional lifecyclePhase) { @java.lang.Override public _FinalStage eventSubtype(String eventSubtype) { - this.eventSubtype = Optional.of(eventSubtype); + this.eventSubtype = Optional.ofNullable(eventSubtype); return this; } diff --git a/src/main/java/com/schematic/api/types/FeatureUsageDetailResponseData.java b/src/main/java/com/schematic/api/types/FeatureUsageDetailResponseData.java index 76e8f48..5375a7c 100644 --- a/src/main/java/com/schematic/api/types/FeatureUsageDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/FeatureUsageDetailResponseData.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = FeatureUsageDetailResponseData.Builder.class) public final class FeatureUsageDetailResponseData { private final List features; diff --git a/src/main/java/com/schematic/api/types/FeatureUsageResponseData.java b/src/main/java/com/schematic/api/types/FeatureUsageResponseData.java index 851e445..4f024ac 100644 --- a/src/main/java/com/schematic/api/types/FeatureUsageResponseData.java +++ b/src/main/java/com/schematic/api/types/FeatureUsageResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = FeatureUsageResponseData.Builder.class) public final class FeatureUsageResponseData { private final boolean access; @@ -39,12 +39,18 @@ public final class FeatureUsageResponseData { private final Optional monthReset; + private final Optional monthlyUsageBasedPrice; + private final Optional period; private final Optional plan; + private final Optional priceBehavior; + private final Optional usage; + private final Optional yearlyUsageBasedPrice; + private final Map additionalProperties; private FeatureUsageResponseData( @@ -57,9 +63,12 @@ private FeatureUsageResponseData( Optional feature, Optional metricResetAt, Optional monthReset, + Optional monthlyUsageBasedPrice, Optional period, Optional plan, + Optional priceBehavior, Optional usage, + Optional yearlyUsageBasedPrice, Map additionalProperties) { this.access = access; this.allocation = allocation; @@ -70,9 +79,12 @@ private FeatureUsageResponseData( this.feature = feature; this.metricResetAt = metricResetAt; this.monthReset = monthReset; + this.monthlyUsageBasedPrice = monthlyUsageBasedPrice; this.period = period; this.plan = plan; + this.priceBehavior = priceBehavior; this.usage = usage; + this.yearlyUsageBasedPrice = yearlyUsageBasedPrice; this.additionalProperties = additionalProperties; } @@ -121,7 +133,7 @@ public Optional getFeature() { } /** - * @return The time at which the metric will resets. + * @return The time at which the metric will reset. */ @JsonProperty("metric_reset_at") public Optional getMetricResetAt() { @@ -136,6 +148,11 @@ public Optional getMonthReset() { return monthReset; } + @JsonProperty("monthly_usage_based_price") + public Optional getMonthlyUsageBasedPrice() { + return monthlyUsageBasedPrice; + } + /** * @return The period over which usage is measured. */ @@ -149,6 +166,11 @@ public Optional getPlan() { return plan; } + @JsonProperty("price_behavior") + public Optional getPriceBehavior() { + return priceBehavior; + } + /** * @return The amount of usage that has been consumed; a null value indicates that usage is not being measured. */ @@ -157,6 +179,11 @@ public Optional getUsage() { return usage; } + @JsonProperty("yearly_usage_based_price") + public Optional getYearlyUsageBasedPrice() { + return yearlyUsageBasedPrice; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -178,9 +205,12 @@ private boolean equalTo(FeatureUsageResponseData other) { && feature.equals(other.feature) && metricResetAt.equals(other.metricResetAt) && monthReset.equals(other.monthReset) + && monthlyUsageBasedPrice.equals(other.monthlyUsageBasedPrice) && period.equals(other.period) && plan.equals(other.plan) - && usage.equals(other.usage); + && priceBehavior.equals(other.priceBehavior) + && usage.equals(other.usage) + && yearlyUsageBasedPrice.equals(other.yearlyUsageBasedPrice); } @java.lang.Override @@ -195,9 +225,12 @@ public int hashCode() { this.feature, this.metricResetAt, this.monthReset, + this.monthlyUsageBasedPrice, this.period, this.plan, - this.usage); + this.priceBehavior, + this.usage, + this.yearlyUsageBasedPrice); } @java.lang.Override @@ -250,6 +283,10 @@ public interface _FinalStage { _FinalStage monthReset(String monthReset); + _FinalStage monthlyUsageBasedPrice(Optional monthlyUsageBasedPrice); + + _FinalStage monthlyUsageBasedPrice(BillingPriceView monthlyUsageBasedPrice); + _FinalStage period(Optional period); _FinalStage period(String period); @@ -258,9 +295,17 @@ public interface _FinalStage { _FinalStage plan(PlanResponseData plan); + _FinalStage priceBehavior(Optional priceBehavior); + + _FinalStage priceBehavior(String priceBehavior); + _FinalStage usage(Optional usage); _FinalStage usage(Integer usage); + + _FinalStage yearlyUsageBasedPrice(Optional yearlyUsageBasedPrice); + + _FinalStage yearlyUsageBasedPrice(BillingPriceView yearlyUsageBasedPrice); } @JsonIgnoreProperties(ignoreUnknown = true) @@ -274,12 +319,18 @@ public static final class Builder private String entitlementType; + private Optional yearlyUsageBasedPrice = Optional.empty(); + private Optional usage = Optional.empty(); + private Optional priceBehavior = Optional.empty(); + private Optional plan = Optional.empty(); private Optional period = Optional.empty(); + private Optional monthlyUsageBasedPrice = Optional.empty(); + private Optional monthReset = Optional.empty(); private Optional metricResetAt = Optional.empty(); @@ -306,9 +357,12 @@ public Builder from(FeatureUsageResponseData other) { feature(other.getFeature()); metricResetAt(other.getMetricResetAt()); monthReset(other.getMonthReset()); + monthlyUsageBasedPrice(other.getMonthlyUsageBasedPrice()); period(other.getPeriod()); plan(other.getPlan()); + priceBehavior(other.getPriceBehavior()); usage(other.getUsage()); + yearlyUsageBasedPrice(other.getYearlyUsageBasedPrice()); return this; } @@ -348,13 +402,26 @@ public _FinalStage entitlementType(String entitlementType) { return this; } + @java.lang.Override + public _FinalStage yearlyUsageBasedPrice(BillingPriceView yearlyUsageBasedPrice) { + this.yearlyUsageBasedPrice = Optional.ofNullable(yearlyUsageBasedPrice); + return this; + } + + @java.lang.Override + @JsonSetter(value = "yearly_usage_based_price", nulls = Nulls.SKIP) + public _FinalStage yearlyUsageBasedPrice(Optional yearlyUsageBasedPrice) { + this.yearlyUsageBasedPrice = yearlyUsageBasedPrice; + return this; + } + /** *

The amount of usage that has been consumed; a null value indicates that usage is not being measured.

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override public _FinalStage usage(Integer usage) { - this.usage = Optional.of(usage); + this.usage = Optional.ofNullable(usage); return this; } @@ -365,9 +432,22 @@ public _FinalStage usage(Optional usage) { return this; } + @java.lang.Override + public _FinalStage priceBehavior(String priceBehavior) { + this.priceBehavior = Optional.ofNullable(priceBehavior); + return this; + } + + @java.lang.Override + @JsonSetter(value = "price_behavior", nulls = Nulls.SKIP) + public _FinalStage priceBehavior(Optional priceBehavior) { + this.priceBehavior = priceBehavior; + return this; + } + @java.lang.Override public _FinalStage plan(PlanResponseData plan) { - this.plan = Optional.of(plan); + this.plan = Optional.ofNullable(plan); return this; } @@ -384,7 +464,7 @@ public _FinalStage plan(Optional plan) { */ @java.lang.Override public _FinalStage period(String period) { - this.period = Optional.of(period); + this.period = Optional.ofNullable(period); return this; } @@ -395,13 +475,26 @@ public _FinalStage period(Optional period) { return this; } + @java.lang.Override + public _FinalStage monthlyUsageBasedPrice(BillingPriceView monthlyUsageBasedPrice) { + this.monthlyUsageBasedPrice = Optional.ofNullable(monthlyUsageBasedPrice); + return this; + } + + @java.lang.Override + @JsonSetter(value = "monthly_usage_based_price", nulls = Nulls.SKIP) + public _FinalStage monthlyUsageBasedPrice(Optional monthlyUsageBasedPrice) { + this.monthlyUsageBasedPrice = monthlyUsageBasedPrice; + return this; + } + /** *

If the period is current_month, when the month resets.

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override public _FinalStage monthReset(String monthReset) { - this.monthReset = Optional.of(monthReset); + this.monthReset = Optional.ofNullable(monthReset); return this; } @@ -413,12 +506,12 @@ public _FinalStage monthReset(Optional monthReset) { } /** - *

The time at which the metric will resets.

+ *

The time at which the metric will reset.

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override public _FinalStage metricResetAt(OffsetDateTime metricResetAt) { - this.metricResetAt = Optional.of(metricResetAt); + this.metricResetAt = Optional.ofNullable(metricResetAt); return this; } @@ -431,7 +524,7 @@ public _FinalStage metricResetAt(Optional metricResetAt) { @java.lang.Override public _FinalStage feature(FeatureDetailResponseData feature) { - this.feature = Optional.of(feature); + this.feature = Optional.ofNullable(feature); return this; } @@ -444,7 +537,7 @@ public _FinalStage feature(Optional feature) { @java.lang.Override public _FinalStage entitlementExpirationDate(OffsetDateTime entitlementExpirationDate) { - this.entitlementExpirationDate = Optional.of(entitlementExpirationDate); + this.entitlementExpirationDate = Optional.ofNullable(entitlementExpirationDate); return this; } @@ -461,7 +554,7 @@ public _FinalStage entitlementExpirationDate(Optional entitlemen */ @java.lang.Override public _FinalStage allocation(Integer allocation) { - this.allocation = Optional.of(allocation); + this.allocation = Optional.ofNullable(allocation); return this; } @@ -484,9 +577,12 @@ public FeatureUsageResponseData build() { feature, metricResetAt, monthReset, + monthlyUsageBasedPrice, period, plan, + priceBehavior, usage, + yearlyUsageBasedPrice, additionalProperties); } } diff --git a/src/main/java/com/schematic/api/types/FlagDetailResponseData.java b/src/main/java/com/schematic/api/types/FlagDetailResponseData.java index dbfefc1..aaa9c16 100644 --- a/src/main/java/com/schematic/api/types/FlagDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/FlagDetailResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = FlagDetailResponseData.Builder.class) public final class FlagDetailResponseData { private final OffsetDateTime createdAt; @@ -399,7 +399,7 @@ public _FinalStage rules(List rules) { @java.lang.Override public _FinalStage maintainerId(String maintainerId) { - this.maintainerId = Optional.of(maintainerId); + this.maintainerId = Optional.ofNullable(maintainerId); return this; } @@ -412,7 +412,7 @@ public _FinalStage maintainerId(Optional maintainerId) { @java.lang.Override public _FinalStage lastCheckedAt(OffsetDateTime lastCheckedAt) { - this.lastCheckedAt = Optional.of(lastCheckedAt); + this.lastCheckedAt = Optional.ofNullable(lastCheckedAt); return this; } @@ -425,7 +425,7 @@ public _FinalStage lastCheckedAt(Optional lastCheckedAt) { @java.lang.Override public _FinalStage featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } @@ -438,7 +438,7 @@ public _FinalStage featureId(Optional featureId) { @java.lang.Override public _FinalStage feature(FeatureResponseData feature) { - this.feature = Optional.of(feature); + this.feature = Optional.ofNullable(feature); return this; } diff --git a/src/main/java/com/schematic/api/types/FlagResponseData.java b/src/main/java/com/schematic/api/types/FlagResponseData.java index b0dfdf0..c062fe4 100644 --- a/src/main/java/com/schematic/api/types/FlagResponseData.java +++ b/src/main/java/com/schematic/api/types/FlagResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = FlagResponseData.Builder.class) public final class FlagResponseData { private final OffsetDateTime createdAt; @@ -321,7 +321,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage maintainerId(String maintainerId) { - this.maintainerId = Optional.of(maintainerId); + this.maintainerId = Optional.ofNullable(maintainerId); return this; } @@ -334,7 +334,7 @@ public _FinalStage maintainerId(Optional maintainerId) { @java.lang.Override public _FinalStage featureId(String featureId) { - this.featureId = Optional.of(featureId); + this.featureId = Optional.ofNullable(featureId); return this; } diff --git a/src/main/java/com/schematic/api/types/GenericPreviewObject.java b/src/main/java/com/schematic/api/types/GenericPreviewObject.java index fa0df7c..f1406fd 100644 --- a/src/main/java/com/schematic/api/types/GenericPreviewObject.java +++ b/src/main/java/com/schematic/api/types/GenericPreviewObject.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = GenericPreviewObject.Builder.class) public final class GenericPreviewObject { private final Optional description; @@ -157,7 +157,7 @@ public _FinalStage name(String name) { @java.lang.Override public _FinalStage imageUrl(String imageUrl) { - this.imageUrl = Optional.of(imageUrl); + this.imageUrl = Optional.ofNullable(imageUrl); return this; } @@ -170,7 +170,7 @@ public _FinalStage imageUrl(Optional imageUrl) { @java.lang.Override public _FinalStage description(String description) { - this.description = Optional.of(description); + this.description = Optional.ofNullable(description); return this; } diff --git a/src/main/java/com/schematic/api/types/InvoiceRequestBody.java b/src/main/java/com/schematic/api/types/InvoiceRequestBody.java index 53c23c7..c9a7ea2 100644 --- a/src/main/java/com/schematic/api/types/InvoiceRequestBody.java +++ b/src/main/java/com/schematic/api/types/InvoiceRequestBody.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = InvoiceRequestBody.Builder.class) public final class InvoiceRequestBody { private final int amountDue; @@ -331,7 +331,7 @@ public _FinalStage subtotal(int subtotal) { @java.lang.Override public _FinalStage url(String url) { - this.url = Optional.of(url); + this.url = Optional.ofNullable(url); return this; } @@ -344,7 +344,7 @@ public _FinalStage url(Optional url) { @java.lang.Override public _FinalStage subscriptionExternalId(String subscriptionExternalId) { - this.subscriptionExternalId = Optional.of(subscriptionExternalId); + this.subscriptionExternalId = Optional.ofNullable(subscriptionExternalId); return this; } @@ -357,7 +357,7 @@ public _FinalStage subscriptionExternalId(Optional subscriptionExternalI @java.lang.Override public _FinalStage paymentMethodExternalId(String paymentMethodExternalId) { - this.paymentMethodExternalId = Optional.of(paymentMethodExternalId); + this.paymentMethodExternalId = Optional.ofNullable(paymentMethodExternalId); return this; } @@ -370,7 +370,7 @@ public _FinalStage paymentMethodExternalId(Optional paymentMethodExterna @java.lang.Override public _FinalStage dueDate(OffsetDateTime dueDate) { - this.dueDate = Optional.of(dueDate); + this.dueDate = Optional.ofNullable(dueDate); return this; } diff --git a/src/main/java/com/schematic/api/types/InvoiceResponseData.java b/src/main/java/com/schematic/api/types/InvoiceResponseData.java index 1608a54..9355cb2 100644 --- a/src/main/java/com/schematic/api/types/InvoiceResponseData.java +++ b/src/main/java/com/schematic/api/types/InvoiceResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = InvoiceResponseData.Builder.class) public final class InvoiceResponseData { private final int amountDue; @@ -471,7 +471,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage url(String url) { - this.url = Optional.of(url); + this.url = Optional.ofNullable(url); return this; } @@ -484,7 +484,7 @@ public _FinalStage url(Optional url) { @java.lang.Override public _FinalStage subscriptionExternalId(String subscriptionExternalId) { - this.subscriptionExternalId = Optional.of(subscriptionExternalId); + this.subscriptionExternalId = Optional.ofNullable(subscriptionExternalId); return this; } @@ -497,7 +497,7 @@ public _FinalStage subscriptionExternalId(Optional subscriptionExternalI @java.lang.Override public _FinalStage paymentMethodExternalId(String paymentMethodExternalId) { - this.paymentMethodExternalId = Optional.of(paymentMethodExternalId); + this.paymentMethodExternalId = Optional.ofNullable(paymentMethodExternalId); return this; } @@ -510,7 +510,7 @@ public _FinalStage paymentMethodExternalId(Optional paymentMethodExterna @java.lang.Override public _FinalStage externalId(String externalId) { - this.externalId = Optional.of(externalId); + this.externalId = Optional.ofNullable(externalId); return this; } @@ -523,7 +523,7 @@ public _FinalStage externalId(Optional externalId) { @java.lang.Override public _FinalStage dueDate(OffsetDateTime dueDate) { - this.dueDate = Optional.of(dueDate); + this.dueDate = Optional.ofNullable(dueDate); return this; } @@ -536,7 +536,7 @@ public _FinalStage dueDate(Optional dueDate) { @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } diff --git a/src/main/java/com/schematic/api/types/IssueTemporaryAccessTokenResponseData.java b/src/main/java/com/schematic/api/types/IssueTemporaryAccessTokenResponseData.java index aa08292..88f1b55 100644 --- a/src/main/java/com/schematic/api/types/IssueTemporaryAccessTokenResponseData.java +++ b/src/main/java/com/schematic/api/types/IssueTemporaryAccessTokenResponseData.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = IssueTemporaryAccessTokenResponseData.Builder.class) public final class IssueTemporaryAccessTokenResponseData { private final String apiKeyId; diff --git a/src/main/java/com/schematic/api/types/KeysRequestBody.java b/src/main/java/com/schematic/api/types/KeysRequestBody.java index 1ccc96b..174d391 100644 --- a/src/main/java/com/schematic/api/types/KeysRequestBody.java +++ b/src/main/java/com/schematic/api/types/KeysRequestBody.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = KeysRequestBody.Builder.class) public final class KeysRequestBody { private final Map keys; diff --git a/src/main/java/com/schematic/api/types/MeterRequestBody.java b/src/main/java/com/schematic/api/types/MeterRequestBody.java index 3f34209..6da139f 100644 --- a/src/main/java/com/schematic/api/types/MeterRequestBody.java +++ b/src/main/java/com/schematic/api/types/MeterRequestBody.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = MeterRequestBody.Builder.class) public final class MeterRequestBody { private final String displayName; diff --git a/src/main/java/com/schematic/api/types/PaginationFilter.java b/src/main/java/com/schematic/api/types/PaginationFilter.java index 844315f..412f477 100644 --- a/src/main/java/com/schematic/api/types/PaginationFilter.java +++ b/src/main/java/com/schematic/api/types/PaginationFilter.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PaginationFilter.Builder.class) public final class PaginationFilter { private final Optional limit; @@ -102,7 +102,7 @@ public Builder limit(Optional limit) { } public Builder limit(Integer limit) { - this.limit = Optional.of(limit); + this.limit = Optional.ofNullable(limit); return this; } @@ -113,7 +113,7 @@ public Builder offset(Optional offset) { } public Builder offset(Integer offset) { - this.offset = Optional.of(offset); + this.offset = Optional.ofNullable(offset); return this; } diff --git a/src/main/java/com/schematic/api/types/PaymentMethodRequestBody.java b/src/main/java/com/schematic/api/types/PaymentMethodRequestBody.java index 1030cfe..d030f29 100644 --- a/src/main/java/com/schematic/api/types/PaymentMethodRequestBody.java +++ b/src/main/java/com/schematic/api/types/PaymentMethodRequestBody.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PaymentMethodRequestBody.Builder.class) public final class PaymentMethodRequestBody { private final Optional accountLast4; @@ -305,7 +305,7 @@ public _FinalStage paymentMethodType(String paymentMethodType) { @java.lang.Override public _FinalStage subscriptionExternalId(String subscriptionExternalId) { - this.subscriptionExternalId = Optional.of(subscriptionExternalId); + this.subscriptionExternalId = Optional.ofNullable(subscriptionExternalId); return this; } @@ -318,7 +318,7 @@ public _FinalStage subscriptionExternalId(Optional subscriptionExternalI @java.lang.Override public _FinalStage cardLast4(String cardLast4) { - this.cardLast4 = Optional.of(cardLast4); + this.cardLast4 = Optional.ofNullable(cardLast4); return this; } @@ -331,7 +331,7 @@ public _FinalStage cardLast4(Optional cardLast4) { @java.lang.Override public _FinalStage cardExpYear(Integer cardExpYear) { - this.cardExpYear = Optional.of(cardExpYear); + this.cardExpYear = Optional.ofNullable(cardExpYear); return this; } @@ -344,7 +344,7 @@ public _FinalStage cardExpYear(Optional cardExpYear) { @java.lang.Override public _FinalStage cardExpMonth(Integer cardExpMonth) { - this.cardExpMonth = Optional.of(cardExpMonth); + this.cardExpMonth = Optional.ofNullable(cardExpMonth); return this; } @@ -357,7 +357,7 @@ public _FinalStage cardExpMonth(Optional cardExpMonth) { @java.lang.Override public _FinalStage cardBrand(String cardBrand) { - this.cardBrand = Optional.of(cardBrand); + this.cardBrand = Optional.ofNullable(cardBrand); return this; } @@ -370,7 +370,7 @@ public _FinalStage cardBrand(Optional cardBrand) { @java.lang.Override public _FinalStage billingName(String billingName) { - this.billingName = Optional.of(billingName); + this.billingName = Optional.ofNullable(billingName); return this; } @@ -383,7 +383,7 @@ public _FinalStage billingName(Optional billingName) { @java.lang.Override public _FinalStage billingEmail(String billingEmail) { - this.billingEmail = Optional.of(billingEmail); + this.billingEmail = Optional.ofNullable(billingEmail); return this; } @@ -396,7 +396,7 @@ public _FinalStage billingEmail(Optional billingEmail) { @java.lang.Override public _FinalStage bankName(String bankName) { - this.bankName = Optional.of(bankName); + this.bankName = Optional.ofNullable(bankName); return this; } @@ -409,7 +409,7 @@ public _FinalStage bankName(Optional bankName) { @java.lang.Override public _FinalStage accountName(String accountName) { - this.accountName = Optional.of(accountName); + this.accountName = Optional.ofNullable(accountName); return this; } @@ -422,7 +422,7 @@ public _FinalStage accountName(Optional accountName) { @java.lang.Override public _FinalStage accountLast4(String accountLast4) { - this.accountLast4 = Optional.of(accountLast4); + this.accountLast4 = Optional.ofNullable(accountLast4); return this; } diff --git a/src/main/java/com/schematic/api/types/PaymentMethodResponseData.java b/src/main/java/com/schematic/api/types/PaymentMethodResponseData.java index ba78bec..4e7e84c 100644 --- a/src/main/java/com/schematic/api/types/PaymentMethodResponseData.java +++ b/src/main/java/com/schematic/api/types/PaymentMethodResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PaymentMethodResponseData.Builder.class) public final class PaymentMethodResponseData { private final Optional accountLast4; @@ -457,7 +457,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage subscriptionExternalId(String subscriptionExternalId) { - this.subscriptionExternalId = Optional.of(subscriptionExternalId); + this.subscriptionExternalId = Optional.ofNullable(subscriptionExternalId); return this; } @@ -470,7 +470,7 @@ public _FinalStage subscriptionExternalId(Optional subscriptionExternalI @java.lang.Override public _FinalStage companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -483,7 +483,7 @@ public _FinalStage companyId(Optional companyId) { @java.lang.Override public _FinalStage cardLast4(String cardLast4) { - this.cardLast4 = Optional.of(cardLast4); + this.cardLast4 = Optional.ofNullable(cardLast4); return this; } @@ -496,7 +496,7 @@ public _FinalStage cardLast4(Optional cardLast4) { @java.lang.Override public _FinalStage cardExpYear(Integer cardExpYear) { - this.cardExpYear = Optional.of(cardExpYear); + this.cardExpYear = Optional.ofNullable(cardExpYear); return this; } @@ -509,7 +509,7 @@ public _FinalStage cardExpYear(Optional cardExpYear) { @java.lang.Override public _FinalStage cardExpMonth(Integer cardExpMonth) { - this.cardExpMonth = Optional.of(cardExpMonth); + this.cardExpMonth = Optional.ofNullable(cardExpMonth); return this; } @@ -522,7 +522,7 @@ public _FinalStage cardExpMonth(Optional cardExpMonth) { @java.lang.Override public _FinalStage cardBrand(String cardBrand) { - this.cardBrand = Optional.of(cardBrand); + this.cardBrand = Optional.ofNullable(cardBrand); return this; } @@ -535,7 +535,7 @@ public _FinalStage cardBrand(Optional cardBrand) { @java.lang.Override public _FinalStage billingName(String billingName) { - this.billingName = Optional.of(billingName); + this.billingName = Optional.ofNullable(billingName); return this; } @@ -548,7 +548,7 @@ public _FinalStage billingName(Optional billingName) { @java.lang.Override public _FinalStage billingEmail(String billingEmail) { - this.billingEmail = Optional.of(billingEmail); + this.billingEmail = Optional.ofNullable(billingEmail); return this; } @@ -561,7 +561,7 @@ public _FinalStage billingEmail(Optional billingEmail) { @java.lang.Override public _FinalStage bankName(String bankName) { - this.bankName = Optional.of(bankName); + this.bankName = Optional.ofNullable(bankName); return this; } @@ -574,7 +574,7 @@ public _FinalStage bankName(Optional bankName) { @java.lang.Override public _FinalStage accountName(String accountName) { - this.accountName = Optional.of(accountName); + this.accountName = Optional.ofNullable(accountName); return this; } @@ -587,7 +587,7 @@ public _FinalStage accountName(Optional accountName) { @java.lang.Override public _FinalStage accountLast4(String accountLast4) { - this.accountLast4 = Optional.of(accountLast4); + this.accountLast4 = Optional.ofNullable(accountLast4); return this; } diff --git a/src/main/java/com/schematic/api/types/PlanAudienceDetailResponseData.java b/src/main/java/com/schematic/api/types/PlanAudienceDetailResponseData.java index 101db86..eedc3d2 100644 --- a/src/main/java/com/schematic/api/types/PlanAudienceDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/PlanAudienceDetailResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PlanAudienceDetailResponseData.Builder.class) public final class PlanAudienceDetailResponseData { private final List conditionGroups; @@ -363,7 +363,7 @@ public _FinalStage value(boolean value) { @java.lang.Override public _FinalStage planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -376,7 +376,7 @@ public _FinalStage planId(Optional planId) { @java.lang.Override public _FinalStage flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } diff --git a/src/main/java/com/schematic/api/types/PlanAudienceResponseData.java b/src/main/java/com/schematic/api/types/PlanAudienceResponseData.java index 805877a..ca6102f 100644 --- a/src/main/java/com/schematic/api/types/PlanAudienceResponseData.java +++ b/src/main/java/com/schematic/api/types/PlanAudienceResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PlanAudienceResponseData.Builder.class) public final class PlanAudienceResponseData { private final OffsetDateTime createdAt; @@ -321,7 +321,7 @@ public _FinalStage value(boolean value) { @java.lang.Override public _FinalStage planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -334,7 +334,7 @@ public _FinalStage planId(Optional planId) { @java.lang.Override public _FinalStage flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } diff --git a/src/main/java/com/schematic/api/types/PlanDetailResponseData.java b/src/main/java/com/schematic/api/types/PlanDetailResponseData.java index a4145cc..760247c 100644 --- a/src/main/java/com/schematic/api/types/PlanDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/PlanDetailResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PlanDetailResponseData.Builder.class) public final class PlanDetailResponseData { private final Optional audienceType; @@ -475,7 +475,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage yearlyPrice(BillingPriceResponseData yearlyPrice) { - this.yearlyPrice = Optional.of(yearlyPrice); + this.yearlyPrice = Optional.ofNullable(yearlyPrice); return this; } @@ -488,7 +488,7 @@ public _FinalStage yearlyPrice(Optional yearlyPrice) { @java.lang.Override public _FinalStage trialDays(Integer trialDays) { - this.trialDays = Optional.of(trialDays); + this.trialDays = Optional.ofNullable(trialDays); return this; } @@ -501,7 +501,7 @@ public _FinalStage trialDays(Optional trialDays) { @java.lang.Override public _FinalStage monthlyPrice(BillingPriceResponseData monthlyPrice) { - this.monthlyPrice = Optional.of(monthlyPrice); + this.monthlyPrice = Optional.ofNullable(monthlyPrice); return this; } @@ -534,7 +534,7 @@ public _FinalStage features(List features) { @java.lang.Override public _FinalStage billingProduct(BillingProductDetailResponseData billingProduct) { - this.billingProduct = Optional.of(billingProduct); + this.billingProduct = Optional.ofNullable(billingProduct); return this; } @@ -547,7 +547,7 @@ public _FinalStage billingProduct(Optional bil @java.lang.Override public _FinalStage audienceType(String audienceType) { - this.audienceType = Optional.of(audienceType); + this.audienceType = Optional.ofNullable(audienceType); return this; } diff --git a/src/main/java/com/schematic/api/types/PlanEntitlementResponseData.java b/src/main/java/com/schematic/api/types/PlanEntitlementResponseData.java index 5b7537a..e68376d 100644 --- a/src/main/java/com/schematic/api/types/PlanEntitlementResponseData.java +++ b/src/main/java/com/schematic/api/types/PlanEntitlementResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PlanEntitlementResponseData.Builder.class) public final class PlanEntitlementResponseData { private final OffsetDateTime createdAt; @@ -483,7 +483,7 @@ public _FinalStage valueType(String valueType) { @java.lang.Override public _FinalStage valueTraitId(String valueTraitId) { - this.valueTraitId = Optional.of(valueTraitId); + this.valueTraitId = Optional.ofNullable(valueTraitId); return this; } @@ -496,7 +496,7 @@ public _FinalStage valueTraitId(Optional valueTraitId) { @java.lang.Override public _FinalStage valueTrait(EntityTraitDefinitionResponseData valueTrait) { - this.valueTrait = Optional.of(valueTrait); + this.valueTrait = Optional.ofNullable(valueTrait); return this; } @@ -509,7 +509,7 @@ public _FinalStage valueTrait(Optional valueT @java.lang.Override public _FinalStage valueNumeric(Integer valueNumeric) { - this.valueNumeric = Optional.of(valueNumeric); + this.valueNumeric = Optional.ofNullable(valueNumeric); return this; } @@ -522,7 +522,7 @@ public _FinalStage valueNumeric(Optional valueNumeric) { @java.lang.Override public _FinalStage valueBool(Boolean valueBool) { - this.valueBool = Optional.of(valueBool); + this.valueBool = Optional.ofNullable(valueBool); return this; } @@ -535,7 +535,7 @@ public _FinalStage valueBool(Optional valueBool) { @java.lang.Override public _FinalStage priceBehavior(String priceBehavior) { - this.priceBehavior = Optional.of(priceBehavior); + this.priceBehavior = Optional.ofNullable(priceBehavior); return this; } @@ -548,7 +548,7 @@ public _FinalStage priceBehavior(Optional priceBehavior) { @java.lang.Override public _FinalStage plan(PlanResponseData plan) { - this.plan = Optional.of(plan); + this.plan = Optional.ofNullable(plan); return this; } @@ -561,7 +561,7 @@ public _FinalStage plan(Optional plan) { @java.lang.Override public _FinalStage metricPeriodMonthReset(String metricPeriodMonthReset) { - this.metricPeriodMonthReset = Optional.of(metricPeriodMonthReset); + this.metricPeriodMonthReset = Optional.ofNullable(metricPeriodMonthReset); return this; } @@ -574,7 +574,7 @@ public _FinalStage metricPeriodMonthReset(Optional metricPeriodMonthRese @java.lang.Override public _FinalStage metricPeriod(String metricPeriod) { - this.metricPeriod = Optional.of(metricPeriod); + this.metricPeriod = Optional.ofNullable(metricPeriod); return this; } @@ -587,7 +587,7 @@ public _FinalStage metricPeriod(Optional metricPeriod) { @java.lang.Override public _FinalStage meteredYearlyPrice(BillingPriceView meteredYearlyPrice) { - this.meteredYearlyPrice = Optional.of(meteredYearlyPrice); + this.meteredYearlyPrice = Optional.ofNullable(meteredYearlyPrice); return this; } @@ -600,7 +600,7 @@ public _FinalStage meteredYearlyPrice(Optional meteredYearlyPr @java.lang.Override public _FinalStage meteredMonthlyPrice(BillingPriceView meteredMonthlyPrice) { - this.meteredMonthlyPrice = Optional.of(meteredMonthlyPrice); + this.meteredMonthlyPrice = Optional.ofNullable(meteredMonthlyPrice); return this; } @@ -613,7 +613,7 @@ public _FinalStage meteredMonthlyPrice(Optional meteredMonthly @java.lang.Override public _FinalStage feature(FeatureResponseData feature) { - this.feature = Optional.of(feature); + this.feature = Optional.ofNullable(feature); return this; } diff --git a/src/main/java/com/schematic/api/types/PlanGroupDetailResponseData.java b/src/main/java/com/schematic/api/types/PlanGroupDetailResponseData.java index 3c157ed..0ff2558 100644 --- a/src/main/java/com/schematic/api/types/PlanGroupDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/PlanGroupDetailResponseData.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PlanGroupDetailResponseData.Builder.class) public final class PlanGroupDetailResponseData { private final List addOns; @@ -214,7 +214,7 @@ public _FinalStage id(String id) { @java.lang.Override public _FinalStage trialPaymentMethodRequired(Boolean trialPaymentMethodRequired) { - this.trialPaymentMethodRequired = Optional.of(trialPaymentMethodRequired); + this.trialPaymentMethodRequired = Optional.ofNullable(trialPaymentMethodRequired); return this; } @@ -227,7 +227,7 @@ public _FinalStage trialPaymentMethodRequired(Optional trialPaymentMeth @java.lang.Override public _FinalStage trialDays(Integer trialDays) { - this.trialDays = Optional.of(trialDays); + this.trialDays = Optional.ofNullable(trialDays); return this; } @@ -260,7 +260,7 @@ public _FinalStage plans(List plans) { @java.lang.Override public _FinalStage defaultPlanId(String defaultPlanId) { - this.defaultPlanId = Optional.of(defaultPlanId); + this.defaultPlanId = Optional.ofNullable(defaultPlanId); return this; } @@ -273,7 +273,7 @@ public _FinalStage defaultPlanId(Optional defaultPlanId) { @java.lang.Override public _FinalStage defaultPlan(PlanGroupPlanDetailResponseData defaultPlan) { - this.defaultPlan = Optional.of(defaultPlan); + this.defaultPlan = Optional.ofNullable(defaultPlan); return this; } diff --git a/src/main/java/com/schematic/api/types/PlanGroupPlanDetailResponseData.java b/src/main/java/com/schematic/api/types/PlanGroupPlanDetailResponseData.java index e49da82..95a863a 100644 --- a/src/main/java/com/schematic/api/types/PlanGroupPlanDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/PlanGroupPlanDetailResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PlanGroupPlanDetailResponseData.Builder.class) public final class PlanGroupPlanDetailResponseData { private final Optional audienceType; @@ -495,7 +495,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage yearlyPrice(BillingPriceResponseData yearlyPrice) { - this.yearlyPrice = Optional.of(yearlyPrice); + this.yearlyPrice = Optional.ofNullable(yearlyPrice); return this; } @@ -508,7 +508,7 @@ public _FinalStage yearlyPrice(Optional yearlyPrice) { @java.lang.Override public _FinalStage trialDays(Integer trialDays) { - this.trialDays = Optional.of(trialDays); + this.trialDays = Optional.ofNullable(trialDays); return this; } @@ -521,7 +521,7 @@ public _FinalStage trialDays(Optional trialDays) { @java.lang.Override public _FinalStage monthlyPrice(BillingPriceResponseData monthlyPrice) { - this.monthlyPrice = Optional.of(monthlyPrice); + this.monthlyPrice = Optional.ofNullable(monthlyPrice); return this; } @@ -574,7 +574,7 @@ public _FinalStage entitlements(List entitlements) @java.lang.Override public _FinalStage billingProduct(BillingProductDetailResponseData billingProduct) { - this.billingProduct = Optional.of(billingProduct); + this.billingProduct = Optional.ofNullable(billingProduct); return this; } @@ -587,7 +587,7 @@ public _FinalStage billingProduct(Optional bil @java.lang.Override public _FinalStage audienceType(String audienceType) { - this.audienceType = Optional.of(audienceType); + this.audienceType = Optional.ofNullable(audienceType); return this; } diff --git a/src/main/java/com/schematic/api/types/PlanGroupResponseData.java b/src/main/java/com/schematic/api/types/PlanGroupResponseData.java index 8028ab5..61413cd 100644 --- a/src/main/java/com/schematic/api/types/PlanGroupResponseData.java +++ b/src/main/java/com/schematic/api/types/PlanGroupResponseData.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PlanGroupResponseData.Builder.class) public final class PlanGroupResponseData { private final List addOnIds; @@ -196,7 +196,7 @@ public _FinalStage id(String id) { @java.lang.Override public _FinalStage trialPaymentMethodRequired(Boolean trialPaymentMethodRequired) { - this.trialPaymentMethodRequired = Optional.of(trialPaymentMethodRequired); + this.trialPaymentMethodRequired = Optional.ofNullable(trialPaymentMethodRequired); return this; } @@ -209,7 +209,7 @@ public _FinalStage trialPaymentMethodRequired(Optional trialPaymentMeth @java.lang.Override public _FinalStage trialDays(Integer trialDays) { - this.trialDays = Optional.of(trialDays); + this.trialDays = Optional.ofNullable(trialDays); return this; } @@ -242,7 +242,7 @@ public _FinalStage planIds(List planIds) { @java.lang.Override public _FinalStage defaultPlanId(String defaultPlanId) { - this.defaultPlanId = Optional.of(defaultPlanId); + this.defaultPlanId = Optional.ofNullable(defaultPlanId); return this; } diff --git a/src/main/java/com/schematic/api/types/PlanResponseData.java b/src/main/java/com/schematic/api/types/PlanResponseData.java index 34a5cae..791be37 100644 --- a/src/main/java/com/schematic/api/types/PlanResponseData.java +++ b/src/main/java/com/schematic/api/types/PlanResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PlanResponseData.Builder.class) public final class PlanResponseData { private final Optional audienceType; @@ -277,7 +277,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage audienceType(String audienceType) { - this.audienceType = Optional.of(audienceType); + this.audienceType = Optional.ofNullable(audienceType); return this; } diff --git a/src/main/java/com/schematic/api/types/PreviewObject.java b/src/main/java/com/schematic/api/types/PreviewObject.java index 5fd6441..3c0ec28 100644 --- a/src/main/java/com/schematic/api/types/PreviewObject.java +++ b/src/main/java/com/schematic/api/types/PreviewObject.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PreviewObject.Builder.class) public final class PreviewObject { private final Optional description; @@ -157,7 +157,7 @@ public _FinalStage name(String name) { @java.lang.Override public _FinalStage imageUrl(String imageUrl) { - this.imageUrl = Optional.of(imageUrl); + this.imageUrl = Optional.ofNullable(imageUrl); return this; } @@ -170,7 +170,7 @@ public _FinalStage imageUrl(Optional imageUrl) { @java.lang.Override public _FinalStage description(String description) { - this.description = Optional.of(description); + this.description = Optional.ofNullable(description); return this; } diff --git a/src/main/java/com/schematic/api/types/PreviewObjectResponseData.java b/src/main/java/com/schematic/api/types/PreviewObjectResponseData.java index a4bc16c..56c23b2 100644 --- a/src/main/java/com/schematic/api/types/PreviewObjectResponseData.java +++ b/src/main/java/com/schematic/api/types/PreviewObjectResponseData.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = PreviewObjectResponseData.Builder.class) public final class PreviewObjectResponseData { private final Optional description; @@ -157,7 +157,7 @@ public _FinalStage name(String name) { @java.lang.Override public _FinalStage imageUrl(String imageUrl) { - this.imageUrl = Optional.of(imageUrl); + this.imageUrl = Optional.ofNullable(imageUrl); return this; } @@ -170,7 +170,7 @@ public _FinalStage imageUrl(Optional imageUrl) { @java.lang.Override public _FinalStage description(String description) { - this.description = Optional.of(description); + this.description = Optional.ofNullable(description); return this; } diff --git a/src/main/java/com/schematic/api/types/PreviewSubscriptionChangeResponseData.java b/src/main/java/com/schematic/api/types/PreviewSubscriptionChangeResponseData.java new file mode 100644 index 0000000..432c1bc --- /dev/null +++ b/src/main/java/com/schematic/api/types/PreviewSubscriptionChangeResponseData.java @@ -0,0 +1,306 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = PreviewSubscriptionChangeResponseData.Builder.class) +public final class PreviewSubscriptionChangeResponseData { + private final int amountOff; + + private final int dueNow; + + private final int newCharges; + + private final double percentOff; + + private final OffsetDateTime periodStart; + + private final boolean promoCodeApplied; + + private final int proration; + + private final Optional trialEnd; + + private final Map additionalProperties; + + private PreviewSubscriptionChangeResponseData( + int amountOff, + int dueNow, + int newCharges, + double percentOff, + OffsetDateTime periodStart, + boolean promoCodeApplied, + int proration, + Optional trialEnd, + Map additionalProperties) { + this.amountOff = amountOff; + this.dueNow = dueNow; + this.newCharges = newCharges; + this.percentOff = percentOff; + this.periodStart = periodStart; + this.promoCodeApplied = promoCodeApplied; + this.proration = proration; + this.trialEnd = trialEnd; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("amount_off") + public int getAmountOff() { + return amountOff; + } + + @JsonProperty("due_now") + public int getDueNow() { + return dueNow; + } + + @JsonProperty("new_charges") + public int getNewCharges() { + return newCharges; + } + + @JsonProperty("percent_off") + public double getPercentOff() { + return percentOff; + } + + @JsonProperty("period_start") + public OffsetDateTime getPeriodStart() { + return periodStart; + } + + @JsonProperty("promo_code_applied") + public boolean getPromoCodeApplied() { + return promoCodeApplied; + } + + @JsonProperty("proration") + public int getProration() { + return proration; + } + + @JsonProperty("trial_end") + public Optional getTrialEnd() { + return trialEnd; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof PreviewSubscriptionChangeResponseData + && equalTo((PreviewSubscriptionChangeResponseData) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(PreviewSubscriptionChangeResponseData other) { + return amountOff == other.amountOff + && dueNow == other.dueNow + && newCharges == other.newCharges + && percentOff == other.percentOff + && periodStart.equals(other.periodStart) + && promoCodeApplied == other.promoCodeApplied + && proration == other.proration + && trialEnd.equals(other.trialEnd); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash( + this.amountOff, + this.dueNow, + this.newCharges, + this.percentOff, + this.periodStart, + this.promoCodeApplied, + this.proration, + this.trialEnd); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static AmountOffStage builder() { + return new Builder(); + } + + public interface AmountOffStage { + DueNowStage amountOff(int amountOff); + + Builder from(PreviewSubscriptionChangeResponseData other); + } + + public interface DueNowStage { + NewChargesStage dueNow(int dueNow); + } + + public interface NewChargesStage { + PercentOffStage newCharges(int newCharges); + } + + public interface PercentOffStage { + PeriodStartStage percentOff(double percentOff); + } + + public interface PeriodStartStage { + PromoCodeAppliedStage periodStart(OffsetDateTime periodStart); + } + + public interface PromoCodeAppliedStage { + ProrationStage promoCodeApplied(boolean promoCodeApplied); + } + + public interface ProrationStage { + _FinalStage proration(int proration); + } + + public interface _FinalStage { + PreviewSubscriptionChangeResponseData build(); + + _FinalStage trialEnd(Optional trialEnd); + + _FinalStage trialEnd(OffsetDateTime trialEnd); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder + implements AmountOffStage, + DueNowStage, + NewChargesStage, + PercentOffStage, + PeriodStartStage, + PromoCodeAppliedStage, + ProrationStage, + _FinalStage { + private int amountOff; + + private int dueNow; + + private int newCharges; + + private double percentOff; + + private OffsetDateTime periodStart; + + private boolean promoCodeApplied; + + private int proration; + + private Optional trialEnd = Optional.empty(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(PreviewSubscriptionChangeResponseData other) { + amountOff(other.getAmountOff()); + dueNow(other.getDueNow()); + newCharges(other.getNewCharges()); + percentOff(other.getPercentOff()); + periodStart(other.getPeriodStart()); + promoCodeApplied(other.getPromoCodeApplied()); + proration(other.getProration()); + trialEnd(other.getTrialEnd()); + return this; + } + + @java.lang.Override + @JsonSetter("amount_off") + public DueNowStage amountOff(int amountOff) { + this.amountOff = amountOff; + return this; + } + + @java.lang.Override + @JsonSetter("due_now") + public NewChargesStage dueNow(int dueNow) { + this.dueNow = dueNow; + return this; + } + + @java.lang.Override + @JsonSetter("new_charges") + public PercentOffStage newCharges(int newCharges) { + this.newCharges = newCharges; + return this; + } + + @java.lang.Override + @JsonSetter("percent_off") + public PeriodStartStage percentOff(double percentOff) { + this.percentOff = percentOff; + return this; + } + + @java.lang.Override + @JsonSetter("period_start") + public PromoCodeAppliedStage periodStart(OffsetDateTime periodStart) { + this.periodStart = periodStart; + return this; + } + + @java.lang.Override + @JsonSetter("promo_code_applied") + public ProrationStage promoCodeApplied(boolean promoCodeApplied) { + this.promoCodeApplied = promoCodeApplied; + return this; + } + + @java.lang.Override + @JsonSetter("proration") + public _FinalStage proration(int proration) { + this.proration = proration; + return this; + } + + @java.lang.Override + public _FinalStage trialEnd(OffsetDateTime trialEnd) { + this.trialEnd = Optional.ofNullable(trialEnd); + return this; + } + + @java.lang.Override + @JsonSetter(value = "trial_end", nulls = Nulls.SKIP) + public _FinalStage trialEnd(Optional trialEnd) { + this.trialEnd = trialEnd; + return this; + } + + @java.lang.Override + public PreviewSubscriptionChangeResponseData build() { + return new PreviewSubscriptionChangeResponseData( + amountOff, + dueNow, + newCharges, + percentOff, + periodStart, + promoCodeApplied, + proration, + trialEnd, + additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/types/RawEventBatchResponseData.java b/src/main/java/com/schematic/api/types/RawEventBatchResponseData.java index 52601fe..c7d8641 100644 --- a/src/main/java/com/schematic/api/types/RawEventBatchResponseData.java +++ b/src/main/java/com/schematic/api/types/RawEventBatchResponseData.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = RawEventBatchResponseData.Builder.class) public final class RawEventBatchResponseData { private final List events; diff --git a/src/main/java/com/schematic/api/types/RawEventResponseData.java b/src/main/java/com/schematic/api/types/RawEventResponseData.java index 19beb0f..450307e 100644 --- a/src/main/java/com/schematic/api/types/RawEventResponseData.java +++ b/src/main/java/com/schematic/api/types/RawEventResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = RawEventResponseData.Builder.class) public final class RawEventResponseData { private final OffsetDateTime capturedAt; @@ -190,7 +190,7 @@ public _FinalStage userAgent(String userAgent) { @java.lang.Override public _FinalStage eventId(String eventId) { - this.eventId = Optional.of(eventId); + this.eventId = Optional.ofNullable(eventId); return this; } diff --git a/src/main/java/com/schematic/api/types/RuleConditionDetailResponseData.java b/src/main/java/com/schematic/api/types/RuleConditionDetailResponseData.java index 99b2a67..ead5e00 100644 --- a/src/main/java/com/schematic/api/types/RuleConditionDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/RuleConditionDetailResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = RuleConditionDetailResponseData.Builder.class) public final class RuleConditionDetailResponseData { private final Optional comparisonTrait; @@ -543,7 +543,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage traitId(String traitId) { - this.traitId = Optional.of(traitId); + this.traitId = Optional.ofNullable(traitId); return this; } @@ -556,7 +556,7 @@ public _FinalStage traitId(Optional traitId) { @java.lang.Override public _FinalStage traitEntityType(String traitEntityType) { - this.traitEntityType = Optional.of(traitEntityType); + this.traitEntityType = Optional.ofNullable(traitEntityType); return this; } @@ -569,7 +569,7 @@ public _FinalStage traitEntityType(Optional traitEntityType) { @java.lang.Override public _FinalStage trait(EntityTraitDefinitionResponseData trait) { - this.trait = Optional.of(trait); + this.trait = Optional.ofNullable(trait); return this; } @@ -622,7 +622,7 @@ public _FinalStage resourceIds(List resourceIds) { @java.lang.Override public _FinalStage planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -635,7 +635,7 @@ public _FinalStage planId(Optional planId) { @java.lang.Override public _FinalStage metricValue(Integer metricValue) { - this.metricValue = Optional.of(metricValue); + this.metricValue = Optional.ofNullable(metricValue); return this; } @@ -648,7 +648,7 @@ public _FinalStage metricValue(Optional metricValue) { @java.lang.Override public _FinalStage metricPeriodMonthReset(String metricPeriodMonthReset) { - this.metricPeriodMonthReset = Optional.of(metricPeriodMonthReset); + this.metricPeriodMonthReset = Optional.ofNullable(metricPeriodMonthReset); return this; } @@ -661,7 +661,7 @@ public _FinalStage metricPeriodMonthReset(Optional metricPeriodMonthRese @java.lang.Override public _FinalStage metricPeriod(String metricPeriod) { - this.metricPeriod = Optional.of(metricPeriod); + this.metricPeriod = Optional.ofNullable(metricPeriod); return this; } @@ -674,7 +674,7 @@ public _FinalStage metricPeriod(Optional metricPeriod) { @java.lang.Override public _FinalStage flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } @@ -687,7 +687,7 @@ public _FinalStage flagId(Optional flagId) { @java.lang.Override public _FinalStage eventSubtype(String eventSubtype) { - this.eventSubtype = Optional.of(eventSubtype); + this.eventSubtype = Optional.ofNullable(eventSubtype); return this; } @@ -700,7 +700,7 @@ public _FinalStage eventSubtype(Optional eventSubtype) { @java.lang.Override public _FinalStage conditionGroupId(String conditionGroupId) { - this.conditionGroupId = Optional.of(conditionGroupId); + this.conditionGroupId = Optional.ofNullable(conditionGroupId); return this; } @@ -713,7 +713,7 @@ public _FinalStage conditionGroupId(Optional conditionGroupId) { @java.lang.Override public _FinalStage comparisonTraitId(String comparisonTraitId) { - this.comparisonTraitId = Optional.of(comparisonTraitId); + this.comparisonTraitId = Optional.ofNullable(comparisonTraitId); return this; } @@ -726,7 +726,7 @@ public _FinalStage comparisonTraitId(Optional comparisonTraitId) { @java.lang.Override public _FinalStage comparisonTrait(EntityTraitDefinitionResponseData comparisonTrait) { - this.comparisonTrait = Optional.of(comparisonTrait); + this.comparisonTrait = Optional.ofNullable(comparisonTrait); return this; } diff --git a/src/main/java/com/schematic/api/types/RuleConditionGroupDetailResponseData.java b/src/main/java/com/schematic/api/types/RuleConditionGroupDetailResponseData.java index ccefc16..915c745 100644 --- a/src/main/java/com/schematic/api/types/RuleConditionGroupDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/RuleConditionGroupDetailResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = RuleConditionGroupDetailResponseData.Builder.class) public final class RuleConditionGroupDetailResponseData { private final List conditions; @@ -261,7 +261,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -274,7 +274,7 @@ public _FinalStage planId(Optional planId) { @java.lang.Override public _FinalStage flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } diff --git a/src/main/java/com/schematic/api/types/RuleConditionGroupResponseData.java b/src/main/java/com/schematic/api/types/RuleConditionGroupResponseData.java index 2eab5e8..8893531 100644 --- a/src/main/java/com/schematic/api/types/RuleConditionGroupResponseData.java +++ b/src/main/java/com/schematic/api/types/RuleConditionGroupResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = RuleConditionGroupResponseData.Builder.class) public final class RuleConditionGroupResponseData { private final OffsetDateTime createdAt; @@ -232,7 +232,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -245,7 +245,7 @@ public _FinalStage planId(Optional planId) { @java.lang.Override public _FinalStage flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } diff --git a/src/main/java/com/schematic/api/types/RuleConditionResponseData.java b/src/main/java/com/schematic/api/types/RuleConditionResponseData.java index c48530a..837925b 100644 --- a/src/main/java/com/schematic/api/types/RuleConditionResponseData.java +++ b/src/main/java/com/schematic/api/types/RuleConditionResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = RuleConditionResponseData.Builder.class) public final class RuleConditionResponseData { private final Optional comparisonTraitId; @@ -487,7 +487,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage traitId(String traitId) { - this.traitId = Optional.of(traitId); + this.traitId = Optional.ofNullable(traitId); return this; } @@ -500,7 +500,7 @@ public _FinalStage traitId(Optional traitId) { @java.lang.Override public _FinalStage traitEntityType(String traitEntityType) { - this.traitEntityType = Optional.of(traitEntityType); + this.traitEntityType = Optional.ofNullable(traitEntityType); return this; } @@ -533,7 +533,7 @@ public _FinalStage resourceIds(List resourceIds) { @java.lang.Override public _FinalStage planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -546,7 +546,7 @@ public _FinalStage planId(Optional planId) { @java.lang.Override public _FinalStage metricValue(Integer metricValue) { - this.metricValue = Optional.of(metricValue); + this.metricValue = Optional.ofNullable(metricValue); return this; } @@ -559,7 +559,7 @@ public _FinalStage metricValue(Optional metricValue) { @java.lang.Override public _FinalStage metricPeriodMonthReset(String metricPeriodMonthReset) { - this.metricPeriodMonthReset = Optional.of(metricPeriodMonthReset); + this.metricPeriodMonthReset = Optional.ofNullable(metricPeriodMonthReset); return this; } @@ -572,7 +572,7 @@ public _FinalStage metricPeriodMonthReset(Optional metricPeriodMonthRese @java.lang.Override public _FinalStage metricPeriod(String metricPeriod) { - this.metricPeriod = Optional.of(metricPeriod); + this.metricPeriod = Optional.ofNullable(metricPeriod); return this; } @@ -585,7 +585,7 @@ public _FinalStage metricPeriod(Optional metricPeriod) { @java.lang.Override public _FinalStage flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } @@ -598,7 +598,7 @@ public _FinalStage flagId(Optional flagId) { @java.lang.Override public _FinalStage eventSubtype(String eventSubtype) { - this.eventSubtype = Optional.of(eventSubtype); + this.eventSubtype = Optional.ofNullable(eventSubtype); return this; } @@ -611,7 +611,7 @@ public _FinalStage eventSubtype(Optional eventSubtype) { @java.lang.Override public _FinalStage conditionGroupId(String conditionGroupId) { - this.conditionGroupId = Optional.of(conditionGroupId); + this.conditionGroupId = Optional.ofNullable(conditionGroupId); return this; } @@ -624,7 +624,7 @@ public _FinalStage conditionGroupId(Optional conditionGroupId) { @java.lang.Override public _FinalStage comparisonTraitId(String comparisonTraitId) { - this.comparisonTraitId = Optional.of(comparisonTraitId); + this.comparisonTraitId = Optional.ofNullable(comparisonTraitId); return this; } diff --git a/src/main/java/com/schematic/api/types/RuleDetailResponseData.java b/src/main/java/com/schematic/api/types/RuleDetailResponseData.java index 5fb47c2..c989e23 100644 --- a/src/main/java/com/schematic/api/types/RuleDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/RuleDetailResponseData.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = RuleDetailResponseData.Builder.class) public final class RuleDetailResponseData { private final List conditionGroups; @@ -363,7 +363,7 @@ public _FinalStage value(boolean value) { @java.lang.Override public _FinalStage planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -376,7 +376,7 @@ public _FinalStage planId(Optional planId) { @java.lang.Override public _FinalStage flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } diff --git a/src/main/java/com/schematic/api/types/RuleResponseData.java b/src/main/java/com/schematic/api/types/RuleResponseData.java index 2235e9e..a53d529 100644 --- a/src/main/java/com/schematic/api/types/RuleResponseData.java +++ b/src/main/java/com/schematic/api/types/RuleResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = RuleResponseData.Builder.class) public final class RuleResponseData { private final OffsetDateTime createdAt; @@ -321,7 +321,7 @@ public _FinalStage value(boolean value) { @java.lang.Override public _FinalStage planId(String planId) { - this.planId = Optional.of(planId); + this.planId = Optional.ofNullable(planId); return this; } @@ -334,7 +334,7 @@ public _FinalStage planId(Optional planId) { @java.lang.Override public _FinalStage flagId(String flagId) { - this.flagId = Optional.of(flagId); + this.flagId = Optional.ofNullable(flagId); return this; } diff --git a/src/main/java/com/schematic/api/types/RulesDetailResponseData.java b/src/main/java/com/schematic/api/types/RulesDetailResponseData.java index 7703ddb..26ba49c 100644 --- a/src/main/java/com/schematic/api/types/RulesDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/RulesDetailResponseData.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = RulesDetailResponseData.Builder.class) public final class RulesDetailResponseData { private final Optional flag; @@ -100,7 +100,7 @@ public Builder flag(Optional flag) { } public Builder flag(FlagResponseData flag) { - this.flag = Optional.of(flag); + this.flag = Optional.ofNullable(flag); return this; } diff --git a/src/main/java/com/schematic/api/types/SegmentStatusResp.java b/src/main/java/com/schematic/api/types/SegmentStatusResp.java index 52f0173..afd4805 100644 --- a/src/main/java/com/schematic/api/types/SegmentStatusResp.java +++ b/src/main/java/com/schematic/api/types/SegmentStatusResp.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = SegmentStatusResp.Builder.class) public final class SegmentStatusResp { private final boolean connected; @@ -141,7 +141,7 @@ public _FinalStage environmentId(String environmentId) { @java.lang.Override public _FinalStage lastEventAt(OffsetDateTime lastEventAt) { - this.lastEventAt = Optional.of(lastEventAt); + this.lastEventAt = Optional.ofNullable(lastEventAt); return this; } diff --git a/src/main/java/com/schematic/api/types/StripeEmbedInfo.java b/src/main/java/com/schematic/api/types/StripeEmbedInfo.java index 1f94bf4..2977c06 100644 --- a/src/main/java/com/schematic/api/types/StripeEmbedInfo.java +++ b/src/main/java/com/schematic/api/types/StripeEmbedInfo.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = StripeEmbedInfo.Builder.class) public final class StripeEmbedInfo { private final String publishableKey; @@ -114,7 +114,7 @@ public _FinalStage publishableKey(String publishableKey) { @java.lang.Override public _FinalStage setupIntentClientSecret(String setupIntentClientSecret) { - this.setupIntentClientSecret = Optional.of(setupIntentClientSecret); + this.setupIntentClientSecret = Optional.ofNullable(setupIntentClientSecret); return this; } diff --git a/src/main/java/com/schematic/api/types/TemporaryAccessTokenResponseData.java b/src/main/java/com/schematic/api/types/TemporaryAccessTokenResponseData.java index be73ddb..387ffb7 100644 --- a/src/main/java/com/schematic/api/types/TemporaryAccessTokenResponseData.java +++ b/src/main/java/com/schematic/api/types/TemporaryAccessTokenResponseData.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = TemporaryAccessTokenResponseData.Builder.class) public final class TemporaryAccessTokenResponseData { private final String apiKeyId; diff --git a/src/main/java/com/schematic/api/types/UpdateAddOnRequestBody.java b/src/main/java/com/schematic/api/types/UpdateAddOnRequestBody.java new file mode 100644 index 0000000..28a80a1 --- /dev/null +++ b/src/main/java/com/schematic/api/types/UpdateAddOnRequestBody.java @@ -0,0 +1,123 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = UpdateAddOnRequestBody.Builder.class) +public final class UpdateAddOnRequestBody { + private final String addOnId; + + private final String priceId; + + private final Map additionalProperties; + + private UpdateAddOnRequestBody(String addOnId, String priceId, Map additionalProperties) { + this.addOnId = addOnId; + this.priceId = priceId; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("add_on_id") + public String getAddOnId() { + return addOnId; + } + + @JsonProperty("price_id") + public String getPriceId() { + return priceId; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof UpdateAddOnRequestBody && equalTo((UpdateAddOnRequestBody) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(UpdateAddOnRequestBody other) { + return addOnId.equals(other.addOnId) && priceId.equals(other.priceId); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.addOnId, this.priceId); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static AddOnIdStage builder() { + return new Builder(); + } + + public interface AddOnIdStage { + PriceIdStage addOnId(String addOnId); + + Builder from(UpdateAddOnRequestBody other); + } + + public interface PriceIdStage { + _FinalStage priceId(String priceId); + } + + public interface _FinalStage { + UpdateAddOnRequestBody build(); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder implements AddOnIdStage, PriceIdStage, _FinalStage { + private String addOnId; + + private String priceId; + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(UpdateAddOnRequestBody other) { + addOnId(other.getAddOnId()); + priceId(other.getPriceId()); + return this; + } + + @java.lang.Override + @JsonSetter("add_on_id") + public PriceIdStage addOnId(String addOnId) { + this.addOnId = addOnId; + return this; + } + + @java.lang.Override + @JsonSetter("price_id") + public _FinalStage priceId(String priceId) { + this.priceId = priceId; + return this; + } + + @java.lang.Override + public UpdateAddOnRequestBody build() { + return new UpdateAddOnRequestBody(addOnId, priceId, additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/types/UpdateEntitlementReqCommon.java b/src/main/java/com/schematic/api/types/UpdateEntitlementReqCommon.java index c5bfdbe..d63ee19 100644 --- a/src/main/java/com/schematic/api/types/UpdateEntitlementReqCommon.java +++ b/src/main/java/com/schematic/api/types/UpdateEntitlementReqCommon.java @@ -17,13 +17,9 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateEntitlementReqCommon.Builder.class) public final class UpdateEntitlementReqCommon { - private final Optional meteredMonthlyPriceId; - - private final Optional meteredYearlyPriceId; - private final Optional metricPeriod; private final Optional metricPeriodMonthReset; @@ -39,8 +35,6 @@ public final class UpdateEntitlementReqCommon { private final Map additionalProperties; private UpdateEntitlementReqCommon( - Optional meteredMonthlyPriceId, - Optional meteredYearlyPriceId, Optional metricPeriod, Optional metricPeriodMonthReset, Optional valueBool, @@ -48,8 +42,6 @@ private UpdateEntitlementReqCommon( Optional valueTraitId, UpdateEntitlementReqCommonValueType valueType, Map additionalProperties) { - this.meteredMonthlyPriceId = meteredMonthlyPriceId; - this.meteredYearlyPriceId = meteredYearlyPriceId; this.metricPeriod = metricPeriod; this.metricPeriodMonthReset = metricPeriodMonthReset; this.valueBool = valueBool; @@ -59,16 +51,6 @@ private UpdateEntitlementReqCommon( this.additionalProperties = additionalProperties; } - @JsonProperty("metered_monthly_price_id") - public Optional getMeteredMonthlyPriceId() { - return meteredMonthlyPriceId; - } - - @JsonProperty("metered_yearly_price_id") - public Optional getMeteredYearlyPriceId() { - return meteredYearlyPriceId; - } - @JsonProperty("metric_period") public Optional getMetricPeriod() { return metricPeriod; @@ -111,9 +93,7 @@ public Map getAdditionalProperties() { } private boolean equalTo(UpdateEntitlementReqCommon other) { - return meteredMonthlyPriceId.equals(other.meteredMonthlyPriceId) - && meteredYearlyPriceId.equals(other.meteredYearlyPriceId) - && metricPeriod.equals(other.metricPeriod) + return metricPeriod.equals(other.metricPeriod) && metricPeriodMonthReset.equals(other.metricPeriodMonthReset) && valueBool.equals(other.valueBool) && valueNumeric.equals(other.valueNumeric) @@ -124,8 +104,6 @@ private boolean equalTo(UpdateEntitlementReqCommon other) { @java.lang.Override public int hashCode() { return Objects.hash( - this.meteredMonthlyPriceId, - this.meteredYearlyPriceId, this.metricPeriod, this.metricPeriodMonthReset, this.valueBool, @@ -152,14 +130,6 @@ public interface ValueTypeStage { public interface _FinalStage { UpdateEntitlementReqCommon build(); - _FinalStage meteredMonthlyPriceId(Optional meteredMonthlyPriceId); - - _FinalStage meteredMonthlyPriceId(String meteredMonthlyPriceId); - - _FinalStage meteredYearlyPriceId(Optional meteredYearlyPriceId); - - _FinalStage meteredYearlyPriceId(String meteredYearlyPriceId); - _FinalStage metricPeriod(Optional metricPeriod); _FinalStage metricPeriod(UpdateEntitlementReqCommonMetricPeriod metricPeriod); @@ -196,10 +166,6 @@ public static final class Builder implements ValueTypeStage, _FinalStage { private Optional metricPeriod = Optional.empty(); - private Optional meteredYearlyPriceId = Optional.empty(); - - private Optional meteredMonthlyPriceId = Optional.empty(); - @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -207,8 +173,6 @@ private Builder() {} @java.lang.Override public Builder from(UpdateEntitlementReqCommon other) { - meteredMonthlyPriceId(other.getMeteredMonthlyPriceId()); - meteredYearlyPriceId(other.getMeteredYearlyPriceId()); metricPeriod(other.getMetricPeriod()); metricPeriodMonthReset(other.getMetricPeriodMonthReset()); valueBool(other.getValueBool()); @@ -227,7 +191,7 @@ public _FinalStage valueType(UpdateEntitlementReqCommonValueType valueType) { @java.lang.Override public _FinalStage valueTraitId(String valueTraitId) { - this.valueTraitId = Optional.of(valueTraitId); + this.valueTraitId = Optional.ofNullable(valueTraitId); return this; } @@ -240,7 +204,7 @@ public _FinalStage valueTraitId(Optional valueTraitId) { @java.lang.Override public _FinalStage valueNumeric(Integer valueNumeric) { - this.valueNumeric = Optional.of(valueNumeric); + this.valueNumeric = Optional.ofNullable(valueNumeric); return this; } @@ -253,7 +217,7 @@ public _FinalStage valueNumeric(Optional valueNumeric) { @java.lang.Override public _FinalStage valueBool(Boolean valueBool) { - this.valueBool = Optional.of(valueBool); + this.valueBool = Optional.ofNullable(valueBool); return this; } @@ -267,7 +231,7 @@ public _FinalStage valueBool(Optional valueBool) { @java.lang.Override public _FinalStage metricPeriodMonthReset( UpdateEntitlementReqCommonMetricPeriodMonthReset metricPeriodMonthReset) { - this.metricPeriodMonthReset = Optional.of(metricPeriodMonthReset); + this.metricPeriodMonthReset = Optional.ofNullable(metricPeriodMonthReset); return this; } @@ -281,7 +245,7 @@ public _FinalStage metricPeriodMonthReset( @java.lang.Override public _FinalStage metricPeriod(UpdateEntitlementReqCommonMetricPeriod metricPeriod) { - this.metricPeriod = Optional.of(metricPeriod); + this.metricPeriod = Optional.ofNullable(metricPeriod); return this; } @@ -292,37 +256,9 @@ public _FinalStage metricPeriod(Optional return this; } - @java.lang.Override - public _FinalStage meteredYearlyPriceId(String meteredYearlyPriceId) { - this.meteredYearlyPriceId = Optional.of(meteredYearlyPriceId); - return this; - } - - @java.lang.Override - @JsonSetter(value = "metered_yearly_price_id", nulls = Nulls.SKIP) - public _FinalStage meteredYearlyPriceId(Optional meteredYearlyPriceId) { - this.meteredYearlyPriceId = meteredYearlyPriceId; - return this; - } - - @java.lang.Override - public _FinalStage meteredMonthlyPriceId(String meteredMonthlyPriceId) { - this.meteredMonthlyPriceId = Optional.of(meteredMonthlyPriceId); - return this; - } - - @java.lang.Override - @JsonSetter(value = "metered_monthly_price_id", nulls = Nulls.SKIP) - public _FinalStage meteredMonthlyPriceId(Optional meteredMonthlyPriceId) { - this.meteredMonthlyPriceId = meteredMonthlyPriceId; - return this; - } - @java.lang.Override public UpdateEntitlementReqCommon build() { return new UpdateEntitlementReqCommon( - meteredMonthlyPriceId, - meteredYearlyPriceId, metricPeriod, metricPeriodMonthReset, valueBool, diff --git a/src/main/java/com/schematic/api/types/UpdateEntitlementReqCommonMetricPeriod.java b/src/main/java/com/schematic/api/types/UpdateEntitlementReqCommonMetricPeriod.java index 1d3df48..98ba2a0 100644 --- a/src/main/java/com/schematic/api/types/UpdateEntitlementReqCommonMetricPeriod.java +++ b/src/main/java/com/schematic/api/types/UpdateEntitlementReqCommonMetricPeriod.java @@ -8,8 +8,6 @@ public enum UpdateEntitlementReqCommonMetricPeriod { ALL_TIME("all_time"), - BILLING("billing"), - CURRENT_MONTH("current_month"), CURRENT_WEEK("current_week"), diff --git a/src/main/java/com/schematic/api/types/UpdatePayInAdvanceRequestBody.java b/src/main/java/com/schematic/api/types/UpdatePayInAdvanceRequestBody.java new file mode 100644 index 0000000..c33b612 --- /dev/null +++ b/src/main/java/com/schematic/api/types/UpdatePayInAdvanceRequestBody.java @@ -0,0 +1,123 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.schematic.api.types; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.schematic.api.core.ObjectMappers; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = UpdatePayInAdvanceRequestBody.Builder.class) +public final class UpdatePayInAdvanceRequestBody { + private final String priceId; + + private final int quantity; + + private final Map additionalProperties; + + private UpdatePayInAdvanceRequestBody(String priceId, int quantity, Map additionalProperties) { + this.priceId = priceId; + this.quantity = quantity; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("price_id") + public String getPriceId() { + return priceId; + } + + @JsonProperty("quantity") + public int getQuantity() { + return quantity; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof UpdatePayInAdvanceRequestBody && equalTo((UpdatePayInAdvanceRequestBody) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(UpdatePayInAdvanceRequestBody other) { + return priceId.equals(other.priceId) && quantity == other.quantity; + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.priceId, this.quantity); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static PriceIdStage builder() { + return new Builder(); + } + + public interface PriceIdStage { + QuantityStage priceId(String priceId); + + Builder from(UpdatePayInAdvanceRequestBody other); + } + + public interface QuantityStage { + _FinalStage quantity(int quantity); + } + + public interface _FinalStage { + UpdatePayInAdvanceRequestBody build(); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder implements PriceIdStage, QuantityStage, _FinalStage { + private String priceId; + + private int quantity; + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(UpdatePayInAdvanceRequestBody other) { + priceId(other.getPriceId()); + quantity(other.getQuantity()); + return this; + } + + @java.lang.Override + @JsonSetter("price_id") + public QuantityStage priceId(String priceId) { + this.priceId = priceId; + return this; + } + + @java.lang.Override + @JsonSetter("quantity") + public _FinalStage quantity(int quantity) { + this.quantity = quantity; + return this; + } + + @java.lang.Override + public UpdatePayInAdvanceRequestBody build() { + return new UpdatePayInAdvanceRequestBody(priceId, quantity, additionalProperties); + } + } +} diff --git a/src/main/java/com/schematic/api/types/UpdateRuleRequestBody.java b/src/main/java/com/schematic/api/types/UpdateRuleRequestBody.java index b396e5c..d3937b8 100644 --- a/src/main/java/com/schematic/api/types/UpdateRuleRequestBody.java +++ b/src/main/java/com/schematic/api/types/UpdateRuleRequestBody.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpdateRuleRequestBody.Builder.class) public final class UpdateRuleRequestBody { private final List conditionGroups; diff --git a/src/main/java/com/schematic/api/types/UpsertCompanyRequestBody.java b/src/main/java/com/schematic/api/types/UpsertCompanyRequestBody.java index 4caa432..4af9d30 100644 --- a/src/main/java/com/schematic/api/types/UpsertCompanyRequestBody.java +++ b/src/main/java/com/schematic/api/types/UpsertCompanyRequestBody.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertCompanyRequestBody.Builder.class) public final class UpsertCompanyRequestBody { private final Optional id; @@ -160,7 +160,7 @@ public Builder id(Optional id) { } public Builder id(String id) { - this.id = Optional.of(id); + this.id = Optional.ofNullable(id); return this; } @@ -188,7 +188,7 @@ public Builder lastSeenAt(Optional lastSeenAt) { } public Builder lastSeenAt(OffsetDateTime lastSeenAt) { - this.lastSeenAt = Optional.of(lastSeenAt); + this.lastSeenAt = Optional.ofNullable(lastSeenAt); return this; } @@ -199,7 +199,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -210,7 +210,7 @@ public Builder traits(Optional> traits) { } public Builder traits(Map traits) { - this.traits = Optional.of(traits); + this.traits = Optional.ofNullable(traits); return this; } @@ -221,7 +221,7 @@ public Builder updateOnly(Optional updateOnly) { } public Builder updateOnly(Boolean updateOnly) { - this.updateOnly = Optional.of(updateOnly); + this.updateOnly = Optional.ofNullable(updateOnly); return this; } diff --git a/src/main/java/com/schematic/api/types/UpsertTraitRequestBody.java b/src/main/java/com/schematic/api/types/UpsertTraitRequestBody.java index 4c6e96e..d6d2072 100644 --- a/src/main/java/com/schematic/api/types/UpsertTraitRequestBody.java +++ b/src/main/java/com/schematic/api/types/UpsertTraitRequestBody.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertTraitRequestBody.Builder.class) public final class UpsertTraitRequestBody { private final Optional incr; @@ -193,7 +193,7 @@ public _FinalStage trait(String trait) { */ @java.lang.Override public _FinalStage updateOnly(Boolean updateOnly) { - this.updateOnly = Optional.of(updateOnly); + this.updateOnly = Optional.ofNullable(updateOnly); return this; } @@ -210,7 +210,7 @@ public _FinalStage updateOnly(Optional updateOnly) { */ @java.lang.Override public _FinalStage set(String set) { - this.set = Optional.of(set); + this.set = Optional.ofNullable(set); return this; } @@ -255,7 +255,7 @@ public _FinalStage keys(Map keys) { */ @java.lang.Override public _FinalStage incr(Integer incr) { - this.incr = Optional.of(incr); + this.incr = Optional.ofNullable(incr); return this; } diff --git a/src/main/java/com/schematic/api/types/UpsertUserRequestBody.java b/src/main/java/com/schematic/api/types/UpsertUserRequestBody.java index c79ae6c..f291232 100644 --- a/src/main/java/com/schematic/api/types/UpsertUserRequestBody.java +++ b/src/main/java/com/schematic/api/types/UpsertUserRequestBody.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertUserRequestBody.Builder.class) public final class UpsertUserRequestBody { private final Map company; @@ -217,7 +217,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -228,7 +228,7 @@ public Builder id(Optional id) { } public Builder id(String id) { - this.id = Optional.of(id); + this.id = Optional.ofNullable(id); return this; } @@ -256,7 +256,7 @@ public Builder lastSeenAt(Optional lastSeenAt) { } public Builder lastSeenAt(OffsetDateTime lastSeenAt) { - this.lastSeenAt = Optional.of(lastSeenAt); + this.lastSeenAt = Optional.ofNullable(lastSeenAt); return this; } @@ -267,7 +267,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -278,7 +278,7 @@ public Builder traits(Optional> traits) { } public Builder traits(Map traits) { - this.traits = Optional.of(traits); + this.traits = Optional.ofNullable(traits); return this; } @@ -289,7 +289,7 @@ public Builder updateOnly(Optional updateOnly) { } public Builder updateOnly(Boolean updateOnly) { - this.updateOnly = Optional.of(updateOnly); + this.updateOnly = Optional.ofNullable(updateOnly); return this; } diff --git a/src/main/java/com/schematic/api/types/UpsertUserSubRequestBody.java b/src/main/java/com/schematic/api/types/UpsertUserSubRequestBody.java index c383ec0..aa9fb17 100644 --- a/src/main/java/com/schematic/api/types/UpsertUserSubRequestBody.java +++ b/src/main/java/com/schematic/api/types/UpsertUserSubRequestBody.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UpsertUserSubRequestBody.Builder.class) public final class UpsertUserSubRequestBody { private final Optional companyId; @@ -177,7 +177,7 @@ public Builder companyId(Optional companyId) { } public Builder companyId(String companyId) { - this.companyId = Optional.of(companyId); + this.companyId = Optional.ofNullable(companyId); return this; } @@ -188,7 +188,7 @@ public Builder id(Optional id) { } public Builder id(String id) { - this.id = Optional.of(id); + this.id = Optional.ofNullable(id); return this; } @@ -216,7 +216,7 @@ public Builder lastSeenAt(Optional lastSeenAt) { } public Builder lastSeenAt(OffsetDateTime lastSeenAt) { - this.lastSeenAt = Optional.of(lastSeenAt); + this.lastSeenAt = Optional.ofNullable(lastSeenAt); return this; } @@ -227,7 +227,7 @@ public Builder name(Optional name) { } public Builder name(String name) { - this.name = Optional.of(name); + this.name = Optional.ofNullable(name); return this; } @@ -238,7 +238,7 @@ public Builder traits(Optional> traits) { } public Builder traits(Map traits) { - this.traits = Optional.of(traits); + this.traits = Optional.ofNullable(traits); return this; } @@ -249,7 +249,7 @@ public Builder updateOnly(Optional updateOnly) { } public Builder updateOnly(Boolean updateOnly) { - this.updateOnly = Optional.of(updateOnly); + this.updateOnly = Optional.ofNullable(updateOnly); return this; } diff --git a/src/main/java/com/schematic/api/types/UsageBasedEntitlementResponseData.java b/src/main/java/com/schematic/api/types/UsageBasedEntitlementResponseData.java index 8fd58e9..4c7ff39 100644 --- a/src/main/java/com/schematic/api/types/UsageBasedEntitlementResponseData.java +++ b/src/main/java/com/schematic/api/types/UsageBasedEntitlementResponseData.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UsageBasedEntitlementResponseData.Builder.class) public final class UsageBasedEntitlementResponseData { private final String featureId; @@ -233,7 +233,7 @@ public _FinalStage valueType(String valueType) { @java.lang.Override public _FinalStage valueNumeric(Integer valueNumeric) { - this.valueNumeric = Optional.of(valueNumeric); + this.valueNumeric = Optional.ofNullable(valueNumeric); return this; } @@ -246,7 +246,7 @@ public _FinalStage valueNumeric(Optional valueNumeric) { @java.lang.Override public _FinalStage valueBool(Boolean valueBool) { - this.valueBool = Optional.of(valueBool); + this.valueBool = Optional.ofNullable(valueBool); return this; } @@ -259,7 +259,7 @@ public _FinalStage valueBool(Optional valueBool) { @java.lang.Override public _FinalStage priceBehavior(String priceBehavior) { - this.priceBehavior = Optional.of(priceBehavior); + this.priceBehavior = Optional.ofNullable(priceBehavior); return this; } @@ -272,7 +272,7 @@ public _FinalStage priceBehavior(Optional priceBehavior) { @java.lang.Override public _FinalStage metricPeriodMonthReset(String metricPeriodMonthReset) { - this.metricPeriodMonthReset = Optional.of(metricPeriodMonthReset); + this.metricPeriodMonthReset = Optional.ofNullable(metricPeriodMonthReset); return this; } @@ -285,7 +285,7 @@ public _FinalStage metricPeriodMonthReset(Optional metricPeriodMonthRese @java.lang.Override public _FinalStage metricPeriod(String metricPeriod) { - this.metricPeriod = Optional.of(metricPeriod); + this.metricPeriod = Optional.ofNullable(metricPeriod); return this; } @@ -298,7 +298,7 @@ public _FinalStage metricPeriod(Optional metricPeriod) { @java.lang.Override public _FinalStage meteredPrice(BillingPriceView meteredPrice) { - this.meteredPrice = Optional.of(meteredPrice); + this.meteredPrice = Optional.ofNullable(meteredPrice); return this; } diff --git a/src/main/java/com/schematic/api/types/UserDetailResponseData.java b/src/main/java/com/schematic/api/types/UserDetailResponseData.java index 9adc592..38d3a73 100644 --- a/src/main/java/com/schematic/api/types/UserDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/UserDetailResponseData.java @@ -21,7 +21,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UserDetailResponseData.Builder.class) public final class UserDetailResponseData { private final List companyMemberships; @@ -308,7 +308,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { */ @java.lang.Override public _FinalStage traits(Map traits) { - this.traits = Optional.of(traits); + this.traits = Optional.ofNullable(traits); return this; } @@ -321,7 +321,7 @@ public _FinalStage traits(Optional> traits) { @java.lang.Override public _FinalStage lastSeenAt(OffsetDateTime lastSeenAt) { - this.lastSeenAt = Optional.of(lastSeenAt); + this.lastSeenAt = Optional.ofNullable(lastSeenAt); return this; } diff --git a/src/main/java/com/schematic/api/types/UserResponseData.java b/src/main/java/com/schematic/api/types/UserResponseData.java index ae7848e..7547b08 100644 --- a/src/main/java/com/schematic/api/types/UserResponseData.java +++ b/src/main/java/com/schematic/api/types/UserResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = UserResponseData.Builder.class) public final class UserResponseData { private final OffsetDateTime createdAt; @@ -214,7 +214,7 @@ public _FinalStage updatedAt(OffsetDateTime updatedAt) { @java.lang.Override public _FinalStage lastSeenAt(OffsetDateTime lastSeenAt) { - this.lastSeenAt = Optional.of(lastSeenAt); + this.lastSeenAt = Optional.ofNullable(lastSeenAt); return this; } diff --git a/src/main/java/com/schematic/api/types/WebhookEventDetailResponseData.java b/src/main/java/com/schematic/api/types/WebhookEventDetailResponseData.java index 51793bd..f887d48 100644 --- a/src/main/java/com/schematic/api/types/WebhookEventDetailResponseData.java +++ b/src/main/java/com/schematic/api/types/WebhookEventDetailResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = WebhookEventDetailResponseData.Builder.class) public final class WebhookEventDetailResponseData { private final OffsetDateTime createdAt; @@ -305,7 +305,7 @@ public _FinalStage webhookId(String webhookId) { @java.lang.Override public _FinalStage webhook(WebhookResponseData webhook) { - this.webhook = Optional.of(webhook); + this.webhook = Optional.ofNullable(webhook); return this; } @@ -318,7 +318,7 @@ public _FinalStage webhook(Optional webhook) { @java.lang.Override public _FinalStage sentAt(OffsetDateTime sentAt) { - this.sentAt = Optional.of(sentAt); + this.sentAt = Optional.ofNullable(sentAt); return this; } @@ -331,7 +331,7 @@ public _FinalStage sentAt(Optional sentAt) { @java.lang.Override public _FinalStage responseCode(Integer responseCode) { - this.responseCode = Optional.of(responseCode); + this.responseCode = Optional.ofNullable(responseCode); return this; } @@ -344,7 +344,7 @@ public _FinalStage responseCode(Optional responseCode) { @java.lang.Override public _FinalStage payload(String payload) { - this.payload = Optional.of(payload); + this.payload = Optional.ofNullable(payload); return this; } diff --git a/src/main/java/com/schematic/api/types/WebhookEventResponseData.java b/src/main/java/com/schematic/api/types/WebhookEventResponseData.java index 592011f..3f66e19 100644 --- a/src/main/java/com/schematic/api/types/WebhookEventResponseData.java +++ b/src/main/java/com/schematic/api/types/WebhookEventResponseData.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = WebhookEventResponseData.Builder.class) public final class WebhookEventResponseData { private final OffsetDateTime createdAt; @@ -287,7 +287,7 @@ public _FinalStage webhookId(String webhookId) { @java.lang.Override public _FinalStage sentAt(OffsetDateTime sentAt) { - this.sentAt = Optional.of(sentAt); + this.sentAt = Optional.ofNullable(sentAt); return this; } @@ -300,7 +300,7 @@ public _FinalStage sentAt(Optional sentAt) { @java.lang.Override public _FinalStage responseCode(Integer responseCode) { - this.responseCode = Optional.of(responseCode); + this.responseCode = Optional.ofNullable(responseCode); return this; } @@ -313,7 +313,7 @@ public _FinalStage responseCode(Optional responseCode) { @java.lang.Override public _FinalStage payload(String payload) { - this.payload = Optional.of(payload); + this.payload = Optional.ofNullable(payload); return this; } diff --git a/src/main/java/com/schematic/api/types/WebhookResponseData.java b/src/main/java/com/schematic/api/types/WebhookResponseData.java index 8fd0981..dd48f47 100644 --- a/src/main/java/com/schematic/api/types/WebhookResponseData.java +++ b/src/main/java/com/schematic/api/types/WebhookResponseData.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = WebhookResponseData.Builder.class) public final class WebhookResponseData { private final OffsetDateTime createdAt;