From 2b61b317887cd1e393662ff57c80e1ad568696fe Mon Sep 17 00:00:00 2001 From: cloudpdf-sdk-bot Date: Wed, 4 Nov 2026 14:20:55 +0000 Subject: [PATCH] chore: generate CloudPDF Java SDK 3.0.0-alpha.22 --- .fern/metadata.json | 4 +- build.gradle | 4 +- cloudpdf-generation.json | 8 +- reference.md | 55 ++ src/main/java/api/core/ClientOptions.java | 2 +- .../deployment/AsyncDeploymentClient.java | 15 + .../deployment/AsyncRawDeploymentClient.java | 73 +++ .../deployment/DeploymentClient.java | 15 + .../deployment/RawDeploymentClient.java | 57 +++ .../tenants/AsyncRawTenantsClient.java | 7 + .../resources/tenants/RawTenantsClient.java | 7 + .../tenants/requests/UsageTenantsRequest.java | 56 ++- src/main/java/api/types/AnnotationCaret.java | 55 ++ src/main/java/api/types/AnnotationCircle.java | 123 ++++- .../java/api/types/AnnotationDraftCaret.java | 46 ++ .../java/api/types/AnnotationDraftCircle.java | 68 ++- .../types/AnnotationDraftFileAttachment.java | 55 ++ .../api/types/AnnotationDraftFreeText.java | 52 +- ...onDraftFreeTextRichTextParagraphsItem.java | 266 ---------- ...ftFreeTextRichTextParagraphsItemAlign.java | 108 ---- ...raftFreeTextRichTextParagraphsItemDir.java | 86 ---- ...FreeTextRichTextParagraphsItemMargins.java | 186 ------- ...reeTextRichTextParagraphsItemRunsItem.java | 152 ------ ...xtRichTextParagraphsItemRunsItemStyle.java | 349 ------------- ...graphsItemRunsItemStyleDecorationItem.java | 101 ---- ...TextParagraphsItemRunsItemStyleScript.java | 98 ---- .../api/types/AnnotationDraftHighlight.java | 46 ++ .../java/api/types/AnnotationDraftInk.java | 68 ++- .../java/api/types/AnnotationDraftLine.java | 80 ++- .../api/types/AnnotationDraftPolygon.java | 68 ++- .../api/types/AnnotationDraftPolyline.java | 68 ++- .../java/api/types/AnnotationDraftRedact.java | 46 ++ .../java/api/types/AnnotationDraftSquare.java | 68 ++- .../api/types/AnnotationDraftSquiggly.java | 46 ++ .../java/api/types/AnnotationDraftStamp.java | 46 ++ .../api/types/AnnotationDraftStrikeout.java | 46 ++ .../java/api/types/AnnotationDraftText.java | 55 ++ .../api/types/AnnotationDraftUnderline.java | 46 ++ .../api/types/AnnotationFileAttachment.java | 55 ++ .../java/api/types/AnnotationFreeText.java | 62 +-- .../java/api/types/AnnotationHighlight.java | 55 ++ src/main/java/api/types/AnnotationInk.java | 123 ++++- src/main/java/api/types/AnnotationLine.java | 123 ++++- .../java/api/types/AnnotationPatchCaret.java | 46 ++ .../java/api/types/AnnotationPatchCircle.java | 68 ++- .../types/AnnotationPatchFileAttachment.java | 46 ++ .../api/types/AnnotationPatchFreeText.java | 52 +- .../AnnotationPatchFreeTextRichText.java | 142 ------ .../AnnotationPatchFreeTextRichTextBody.java | 476 ------------------ ...chFreeTextRichTextParagraphsItemAlign.java | 108 ---- ...atchFreeTextRichTextParagraphsItemDir.java | 86 ---- ...FreeTextRichTextParagraphsItemMargins.java | 186 ------- ...graphsItemRunsItemStyleDecorationItem.java | 101 ---- ...TextParagraphsItemRunsItemStyleScript.java | 98 ---- .../api/types/AnnotationPatchHighlight.java | 46 ++ .../java/api/types/AnnotationPatchInk.java | 68 ++- .../java/api/types/AnnotationPatchLine.java | 68 ++- .../api/types/AnnotationPatchPolygon.java | 68 ++- .../api/types/AnnotationPatchPolyline.java | 68 ++- .../java/api/types/AnnotationPatchRedact.java | 46 ++ .../java/api/types/AnnotationPatchSquare.java | 68 ++- .../api/types/AnnotationPatchSquiggly.java | 46 ++ .../java/api/types/AnnotationPatchStamp.java | 46 ++ .../api/types/AnnotationPatchStrikeout.java | 46 ++ .../java/api/types/AnnotationPatchText.java | 46 ++ .../api/types/AnnotationPatchUnderline.java | 46 ++ .../java/api/types/AnnotationPolygon.java | 123 ++++- .../java/api/types/AnnotationPolyline.java | 123 ++++- src/main/java/api/types/AnnotationRedact.java | 55 ++ src/main/java/api/types/AnnotationSquare.java | 123 ++++- .../java/api/types/AnnotationSquiggly.java | 55 ++ src/main/java/api/types/AnnotationStamp.java | 55 ++ .../java/api/types/AnnotationStrikeout.java | 55 ++ src/main/java/api/types/AnnotationText.java | 55 ++ .../java/api/types/AnnotationUnderline.java | 55 ++ .../api/types/DeploymentModulesResponse.java | 116 +++++ src/main/java/api/types/ModuleManifest.java | 288 +++++++++++ .../api/types/ModuleManifestRequires.java | 116 +++++ src/main/java/api/types/ModuleMeter.java | 200 ++++++++ src/main/java/api/types/ModulePermission.java | 261 ++++++++++ .../java/api/types/ModulePermissionLevel.java | 84 ++++ ...extRichText.java => RichTextDocument.java} | 52 +- ...extBody.java => RichTextDocumentBody.java} | 92 ++-- ...gn.java => RichTextDocumentBodyAlign.java} | 24 +- ...> RichTextDocumentBodyDecorationItem.java} | 24 +- ...yDir.java => RichTextDocumentBodyDir.java} | 18 +- ....java => RichTextDocumentBodyMargins.java} | 21 +- ...t.java => RichTextDocumentBodyScript.java} | 21 +- ...chText.java => RichTextDocumentInput.java} | 42 +- ...dy.java => RichTextDocumentInputBody.java} | 77 ++- ...va => RichTextDocumentInputBodyAlign.java} | 26 +- ...hTextDocumentInputBodyDecorationItem.java} | 24 +- ...java => RichTextDocumentInputBodyDir.java} | 18 +- ... => RichTextDocumentInputBodyMargins.java} | 21 +- ...a => RichTextDocumentInputBodyScript.java} | 23 +- ... RichTextDocumentInputParagraphsItem.java} | 68 +-- ...TextDocumentInputParagraphsItemAlign.java} | 28 +- ...chTextDocumentInputParagraphsItemDir.java} | 20 +- ...xtDocumentInputParagraphsItemMargins.java} | 22 +- ...tDocumentInputParagraphsItemRunsItem.java} | 38 +- ...mentInputParagraphsItemRunsItemStyle.java} | 43 +- ...raphsItemRunsItemStyleDecorationItem.java} | 24 +- ...putParagraphsItemRunsItemStyleScript.java} | 25 +- ...va => RichTextDocumentParagraphsItem.java} | 67 ++- ... RichTextDocumentParagraphsItemAlign.java} | 28 +- ...=> RichTextDocumentParagraphsItemDir.java} | 16 +- ...ichTextDocumentParagraphsItemMargins.java} | 22 +- ...chTextDocumentParagraphsItemRunsItem.java} | 38 +- ...tDocumentParagraphsItemRunsItemStyle.java} | 44 +- ...raphsItemRunsItemStyleDecorationItem.java} | 25 +- ...entParagraphsItemRunsItemStyleScript.java} | 24 +- 111 files changed, 4710 insertions(+), 3289 deletions(-) delete mode 100644 src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItem.java delete mode 100644 src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemAlign.java delete mode 100644 src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemDir.java delete mode 100644 src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemMargins.java delete mode 100644 src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItem.java delete mode 100644 src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle.java delete mode 100644 src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem.java delete mode 100644 src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript.java delete mode 100644 src/main/java/api/types/AnnotationPatchFreeTextRichText.java delete mode 100644 src/main/java/api/types/AnnotationPatchFreeTextRichTextBody.java delete mode 100644 src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemAlign.java delete mode 100644 src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemDir.java delete mode 100644 src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemMargins.java delete mode 100644 src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem.java delete mode 100644 src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript.java create mode 100644 src/main/java/api/types/DeploymentModulesResponse.java create mode 100644 src/main/java/api/types/ModuleManifest.java create mode 100644 src/main/java/api/types/ModuleManifestRequires.java create mode 100644 src/main/java/api/types/ModuleMeter.java create mode 100644 src/main/java/api/types/ModulePermission.java create mode 100644 src/main/java/api/types/ModulePermissionLevel.java rename src/main/java/api/types/{AnnotationFreeTextRichText.java => RichTextDocument.java} (65%) rename src/main/java/api/types/{AnnotationFreeTextRichTextBody.java => RichTextDocumentBody.java} (79%) rename src/main/java/api/types/{AnnotationDraftFreeTextRichTextBodyAlign.java => RichTextDocumentBodyAlign.java} (62%) rename src/main/java/api/types/{AnnotationFreeTextRichTextBodyDecorationItem.java => RichTextDocumentBodyDecorationItem.java} (62%) rename src/main/java/api/types/{AnnotationPatchFreeTextRichTextBodyDir.java => RichTextDocumentBodyDir.java} (65%) rename src/main/java/api/types/{AnnotationPatchFreeTextRichTextBodyMargins.java => RichTextDocumentBodyMargins.java} (84%) rename src/main/java/api/types/{AnnotationFreeTextRichTextBodyScript.java => RichTextDocumentBodyScript.java} (64%) rename src/main/java/api/types/{AnnotationDraftFreeTextRichText.java => RichTextDocumentInput.java} (65%) rename src/main/java/api/types/{AnnotationDraftFreeTextRichTextBody.java => RichTextDocumentInputBody.java} (79%) rename src/main/java/api/types/{AnnotationFreeTextRichTextParagraphsItemAlign.java => RichTextDocumentInputBodyAlign.java} (60%) rename src/main/java/api/types/{AnnotationPatchFreeTextRichTextBodyDecorationItem.java => RichTextDocumentInputBodyDecorationItem.java} (60%) rename src/main/java/api/types/{AnnotationFreeTextRichTextParagraphsItemDir.java => RichTextDocumentInputBodyDir.java} (64%) rename src/main/java/api/types/{AnnotationFreeTextRichTextParagraphsItemMargins.java => RichTextDocumentInputBodyMargins.java} (83%) rename src/main/java/api/types/{AnnotationDraftFreeTextRichTextBodyScript.java => RichTextDocumentInputBodyScript.java} (63%) rename src/main/java/api/types/{AnnotationFreeTextRichTextParagraphsItem.java => RichTextDocumentInputParagraphsItem.java} (69%) rename src/main/java/api/types/{AnnotationPatchFreeTextRichTextBodyAlign.java => RichTextDocumentInputParagraphsItemAlign.java} (67%) rename src/main/java/api/types/{AnnotationDraftFreeTextRichTextBodyDir.java => RichTextDocumentInputParagraphsItemDir.java} (69%) rename src/main/java/api/types/{AnnotationDraftFreeTextRichTextBodyMargins.java => RichTextDocumentInputParagraphsItemMargins.java} (86%) rename src/main/java/api/types/{AnnotationFreeTextRichTextParagraphsItemRunsItem.java => RichTextDocumentInputParagraphsItemRunsItem.java} (67%) rename src/main/java/api/types/{AnnotationFreeTextRichTextParagraphsItemRunsItemStyle.java => RichTextDocumentInputParagraphsItemRunsItemStyle.java} (82%) rename src/main/java/api/types/{AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem.java => RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem.java} (57%) rename src/main/java/api/types/{AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript.java => RichTextDocumentInputParagraphsItemRunsItemStyleScript.java} (57%) rename src/main/java/api/types/{AnnotationPatchFreeTextRichTextParagraphsItem.java => RichTextDocumentParagraphsItem.java} (68%) rename src/main/java/api/types/{AnnotationFreeTextRichTextBodyAlign.java => RichTextDocumentParagraphsItemAlign.java} (67%) rename src/main/java/api/types/{AnnotationFreeTextRichTextBodyDir.java => RichTextDocumentParagraphsItemDir.java} (69%) rename src/main/java/api/types/{AnnotationFreeTextRichTextBodyMargins.java => RichTextDocumentParagraphsItemMargins.java} (87%) rename src/main/java/api/types/{AnnotationPatchFreeTextRichTextParagraphsItemRunsItem.java => RichTextDocumentParagraphsItemRunsItem.java} (66%) rename src/main/java/api/types/{AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle.java => RichTextDocumentParagraphsItemRunsItemStyle.java} (80%) rename src/main/java/api/types/{AnnotationDraftFreeTextRichTextBodyDecorationItem.java => RichTextDocumentParagraphsItemRunsItemStyleDecorationItem.java} (58%) rename src/main/java/api/types/{AnnotationPatchFreeTextRichTextBodyScript.java => RichTextDocumentParagraphsItemRunsItemStyleScript.java} (60%) diff --git a/.fern/metadata.json b/.fern/metadata.json index 90a43e1..9bf854d 100644 --- a/.fern/metadata.json +++ b/.fern/metadata.json @@ -10,9 +10,9 @@ "base-exception-class-name": "CloudPDFException", "base-api-exception-class-name": "CloudPDFApiException" }, - "originGitCommit": "3283147ded32fc15c426768f75557a4d95943d84", + "originGitCommit": "ce65e1390549db1272ac3720a5ddfcea55be2c07", "originGitCommitIsDirty": false, "invokedBy": "ci", - "requestedVersion": "3.0.0-alpha.21", + "requestedVersion": "3.0.0-alpha.22", "ciProvider": "github" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 194be9c..83be202 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ java { group = 'com.cloudpdf' -version = '3.0.0-alpha.21' +version = '3.0.0-alpha.22' jar { dependsOn(":generatePomFileForMavenPublication") @@ -73,7 +73,7 @@ publishing { maven(MavenPublication) { groupId = 'com.cloudpdf' artifactId = 'sdk' - version = '3.0.0-alpha.21' + version = '3.0.0-alpha.22' from components.java pom { name = 'CloudPDF' diff --git a/cloudpdf-generation.json b/cloudpdf-generation.json index 3efa5e6..2b13cfe 100644 --- a/cloudpdf-generation.json +++ b/cloudpdf-generation.json @@ -1,12 +1,12 @@ { "language": "java", - "canonicalVersion": "3.0.0-next.21", - "sdkVersion": "3.0.0-alpha.21", + "canonicalVersion": "3.0.0-next.22", + "sdkVersion": "3.0.0-alpha.22", "source": { "repository": "embedpdf/embed-pdf-viewer", "openapi": "cloudpdf/contract/openapi.json", - "openapiSha256": "f85648401f5c683a32e2b50acc3d753df9f4ce06df8492e5d2b599beceb0e788", - "gitCommit": "3283147ded32fc15c426768f75557a4d95943d84", + "openapiSha256": "1f5aa976eec4d5fc4e2b22efe725df58a01389896733ec1870f96a6441b62859", + "gitCommit": "ce65e1390549db1272ac3720a5ddfcea55be2c07", "gitCommitIsDirty": false }, "fern": { diff --git a/reference.md b/reference.md index 44e2a3c..7cc1cba 100644 --- a/reference.md +++ b/reference.md @@ -21,6 +21,45 @@ client.deployment().licenseStatus(); + + + + +
client.deployment.modules() -> DeploymentModulesResponse +
+
+ +#### 📝 Description + +
+
+ +
+
+ +What each module declares, for a dashboard or a script that lists modules, offers their permissions in its dialogs and shows their meters. Which tenants may use one is in their `features` (`tenants.get`); what it costs, if anything, is the operator's. +
+
+
+
+ +#### 🔌 Usage + +
+
+ +
+
+ +```java +client.deployment().modules(); +``` +
+
+
+
+ +
@@ -1659,6 +1698,22 @@ client.tenants().usage( **period:** `Optional` + + + +
+
+ +**from:** `Optional` + +
+
+ +
+
+ +**to:** `Optional` +
diff --git a/src/main/java/api/core/ClientOptions.java b/src/main/java/api/core/ClientOptions.java index 6ff21ba..59d93e3 100644 --- a/src/main/java/api/core/ClientOptions.java +++ b/src/main/java/api/core/ClientOptions.java @@ -49,7 +49,7 @@ private ClientOptions( { put("X-Fern-Language", "JAVA"); put("X-Fern-SDK-Name", "com.cloudpdf:sdk"); - put("X-Fern-SDK-Version", "3.0.0-alpha.21"); + put("X-Fern-SDK-Version", "3.0.0-alpha.22"); } }); this.headerSuppliers = headerSuppliers; diff --git a/src/main/java/api/resources/deployment/AsyncDeploymentClient.java b/src/main/java/api/resources/deployment/AsyncDeploymentClient.java index 70af145..d2f897c 100644 --- a/src/main/java/api/resources/deployment/AsyncDeploymentClient.java +++ b/src/main/java/api/resources/deployment/AsyncDeploymentClient.java @@ -6,6 +6,7 @@ import com.cloudpdf.api.core.ClientOptions; import com.cloudpdf.api.core.RequestOptions; import com.cloudpdf.api.types.DeploymentLicenseStatusResponse; +import com.cloudpdf.api.types.DeploymentModulesResponse; import java.util.concurrent.CompletableFuture; public class AsyncDeploymentClient { @@ -32,4 +33,18 @@ public CompletableFuture licenseStatus() { public CompletableFuture licenseStatus(RequestOptions requestOptions) { return this.rawClient.licenseStatus(requestOptions).thenApply(response -> response.body()); } + + /** + * What each module declares, for a dashboard or a script that lists modules, offers their permissions in its dialogs and shows their meters. Which tenants may use one is in their features (tenants.get); what it costs, if anything, is the operator's. + */ + public CompletableFuture modules() { + return this.rawClient.modules().thenApply(response -> response.body()); + } + + /** + * What each module declares, for a dashboard or a script that lists modules, offers their permissions in its dialogs and shows their meters. Which tenants may use one is in their features (tenants.get); what it costs, if anything, is the operator's. + */ + public CompletableFuture modules(RequestOptions requestOptions) { + return this.rawClient.modules(requestOptions).thenApply(response -> response.body()); + } } diff --git a/src/main/java/api/resources/deployment/AsyncRawDeploymentClient.java b/src/main/java/api/resources/deployment/AsyncRawDeploymentClient.java index cf8fc16..01a6d64 100644 --- a/src/main/java/api/resources/deployment/AsyncRawDeploymentClient.java +++ b/src/main/java/api/resources/deployment/AsyncRawDeploymentClient.java @@ -11,6 +11,7 @@ import com.cloudpdf.api.core.RequestOptions; import com.cloudpdf.api.core.RetryInterceptor; import com.cloudpdf.api.types.DeploymentLicenseStatusResponse; +import com.cloudpdf.api.types.DeploymentModulesResponse; import com.fasterxml.jackson.core.JsonProcessingException; import java.io.IOException; import java.util.concurrent.CompletableFuture; @@ -97,4 +98,76 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { }); return future; } + + /** + * What each module declares, for a dashboard or a script that lists modules, offers their permissions in its dialogs and shows their meters. Which tenants may use one is in their features (tenants.get); what it costs, if anything, is the operator's. + */ + public CompletableFuture> modules() { + return modules(null); + } + + /** + * What each module declares, for a dashboard or a script that lists modules, offers their permissions in its dialogs and shows their meters. Which tenants may use one is in their features (tenants.get); what it costs, if anything, is the operator's. + */ + public CompletableFuture> modules( + RequestOptions requestOptions) { + HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) + .newBuilder() + .addPathSegments("v1/deployment/modules"); + if (requestOptions != null) { + requestOptions.getQueryParameters().forEach((_key, _value) -> { + httpUrl.addQueryParameter(_key, _value); + }); + } + Request okhttpRequest = new Request.Builder() + .url(httpUrl.build()) + .method("GET", null) + .headers(Headers.of(clientOptions.headers(requestOptions))) + .addHeader("Accept", "application/json") + .build(); + OkHttpClient client = clientOptions.httpClient(); + if (requestOptions != null && requestOptions.getTimeout().isPresent()) { + client = clientOptions.httpClientWithTimeout(requestOptions); + } + if (requestOptions != null && requestOptions.getMaxRetries().isPresent()) { + okhttpRequest = okhttpRequest + .newBuilder() + .tag( + RetryInterceptor.MaxRetriesOverride.class, + new RetryInterceptor.MaxRetriesOverride( + requestOptions.getMaxRetries().get())) + .build(); + } + CompletableFuture> future = new CompletableFuture<>(); + client.newCall(okhttpRequest).enqueue(new Callback() { + @Override + public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { + try (ResponseBody responseBody = response.body()) { + String responseBodyString = responseBody != null ? responseBody.string() : "{}"; + if (response.isSuccessful()) { + future.complete(new CloudPDFClientHttpResponse<>( + ObjectMappers.JSON_MAPPER.readValue( + responseBodyString, DeploymentModulesResponse.class), + response)); + return; + } + Object errorBody = ObjectMappers.parseErrorBody(responseBodyString); + future.completeExceptionally(new CloudPDFApiException( + "Error with status code " + response.code(), response.code(), errorBody, response)); + return; + } catch (JsonProcessingException e) { + future.completeExceptionally( + new CloudPDFException("Failed to deserialize response: " + e.getMessage(), e)); + } catch (IOException e) { + future.completeExceptionally(new CloudPDFException("Network error executing HTTP request", e)); + } + } + + @Override + public void onFailure(@NotNull Call call, @NotNull IOException e) { + future.completeExceptionally(new CloudPDFException("Network error executing HTTP request", e)); + } + }); + return future; + } } diff --git a/src/main/java/api/resources/deployment/DeploymentClient.java b/src/main/java/api/resources/deployment/DeploymentClient.java index e0a19ed..fe3695a 100644 --- a/src/main/java/api/resources/deployment/DeploymentClient.java +++ b/src/main/java/api/resources/deployment/DeploymentClient.java @@ -6,6 +6,7 @@ import com.cloudpdf.api.core.ClientOptions; import com.cloudpdf.api.core.RequestOptions; import com.cloudpdf.api.types.DeploymentLicenseStatusResponse; +import com.cloudpdf.api.types.DeploymentModulesResponse; public class DeploymentClient { protected final ClientOptions clientOptions; @@ -31,4 +32,18 @@ public DeploymentLicenseStatusResponse licenseStatus() { public DeploymentLicenseStatusResponse licenseStatus(RequestOptions requestOptions) { return this.rawClient.licenseStatus(requestOptions).body(); } + + /** + * What each module declares, for a dashboard or a script that lists modules, offers their permissions in its dialogs and shows their meters. Which tenants may use one is in their features (tenants.get); what it costs, if anything, is the operator's. + */ + public DeploymentModulesResponse modules() { + return this.rawClient.modules().body(); + } + + /** + * What each module declares, for a dashboard or a script that lists modules, offers their permissions in its dialogs and shows their meters. Which tenants may use one is in their features (tenants.get); what it costs, if anything, is the operator's. + */ + public DeploymentModulesResponse modules(RequestOptions requestOptions) { + return this.rawClient.modules(requestOptions).body(); + } } diff --git a/src/main/java/api/resources/deployment/RawDeploymentClient.java b/src/main/java/api/resources/deployment/RawDeploymentClient.java index 4680573..4c534cd 100644 --- a/src/main/java/api/resources/deployment/RawDeploymentClient.java +++ b/src/main/java/api/resources/deployment/RawDeploymentClient.java @@ -11,6 +11,7 @@ import com.cloudpdf.api.core.RequestOptions; import com.cloudpdf.api.core.RetryInterceptor; import com.cloudpdf.api.types.DeploymentLicenseStatusResponse; +import com.cloudpdf.api.types.DeploymentModulesResponse; import com.fasterxml.jackson.core.JsonProcessingException; import java.io.IOException; import okhttp3.Headers; @@ -76,4 +77,60 @@ public CloudPDFClientHttpResponse licenseStatus throw new CloudPDFException("Network error executing HTTP request", e); } } + + /** + * What each module declares, for a dashboard or a script that lists modules, offers their permissions in its dialogs and shows their meters. Which tenants may use one is in their features (tenants.get); what it costs, if anything, is the operator's. + */ + public CloudPDFClientHttpResponse modules() { + return modules(null); + } + + /** + * What each module declares, for a dashboard or a script that lists modules, offers their permissions in its dialogs and shows their meters. Which tenants may use one is in their features (tenants.get); what it costs, if anything, is the operator's. + */ + public CloudPDFClientHttpResponse modules(RequestOptions requestOptions) { + HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) + .newBuilder() + .addPathSegments("v1/deployment/modules"); + if (requestOptions != null) { + requestOptions.getQueryParameters().forEach((_key, _value) -> { + httpUrl.addQueryParameter(_key, _value); + }); + } + Request okhttpRequest = new Request.Builder() + .url(httpUrl.build()) + .method("GET", null) + .headers(Headers.of(clientOptions.headers(requestOptions))) + .addHeader("Accept", "application/json") + .build(); + OkHttpClient client = clientOptions.httpClient(); + if (requestOptions != null && requestOptions.getTimeout().isPresent()) { + client = clientOptions.httpClientWithTimeout(requestOptions); + } + if (requestOptions != null && requestOptions.getMaxRetries().isPresent()) { + okhttpRequest = okhttpRequest + .newBuilder() + .tag( + RetryInterceptor.MaxRetriesOverride.class, + new RetryInterceptor.MaxRetriesOverride( + requestOptions.getMaxRetries().get())) + .build(); + } + try (Response response = client.newCall(okhttpRequest).execute()) { + ResponseBody responseBody = response.body(); + String responseBodyString = responseBody != null ? responseBody.string() : "{}"; + if (response.isSuccessful()) { + return new CloudPDFClientHttpResponse<>( + ObjectMappers.JSON_MAPPER.readValue(responseBodyString, DeploymentModulesResponse.class), + response); + } + Object errorBody = ObjectMappers.parseErrorBody(responseBodyString); + throw new CloudPDFApiException( + "Error with status code " + response.code(), response.code(), errorBody, response); + } catch (JsonProcessingException e) { + throw new CloudPDFException("Failed to deserialize response: " + e.getMessage(), e); + } catch (IOException e) { + throw new CloudPDFException("Network error executing HTTP request", e); + } + } } diff --git a/src/main/java/api/resources/tenants/AsyncRawTenantsClient.java b/src/main/java/api/resources/tenants/AsyncRawTenantsClient.java index bbfa499..fdcc505 100644 --- a/src/main/java/api/resources/tenants/AsyncRawTenantsClient.java +++ b/src/main/java/api/resources/tenants/AsyncRawTenantsClient.java @@ -717,6 +717,13 @@ public CompletableFuture> us QueryStringMapper.addQueryParameter( httpUrl, "period", request.getPeriod().get(), false); } + if (request.getFrom().isPresent()) { + QueryStringMapper.addQueryParameter( + httpUrl, "from", request.getFrom().get(), false); + } + if (request.getTo().isPresent()) { + QueryStringMapper.addQueryParameter(httpUrl, "to", request.getTo().get(), false); + } if (requestOptions != null) { requestOptions.getQueryParameters().forEach((_key, _value) -> { httpUrl.addQueryParameter(_key, _value); diff --git a/src/main/java/api/resources/tenants/RawTenantsClient.java b/src/main/java/api/resources/tenants/RawTenantsClient.java index bcefea0..34c8ab2 100644 --- a/src/main/java/api/resources/tenants/RawTenantsClient.java +++ b/src/main/java/api/resources/tenants/RawTenantsClient.java @@ -598,6 +598,13 @@ public CloudPDFClientHttpResponse usage( QueryStringMapper.addQueryParameter( httpUrl, "period", request.getPeriod().get(), false); } + if (request.getFrom().isPresent()) { + QueryStringMapper.addQueryParameter( + httpUrl, "from", request.getFrom().get(), false); + } + if (request.getTo().isPresent()) { + QueryStringMapper.addQueryParameter(httpUrl, "to", request.getTo().get(), false); + } if (requestOptions != null) { requestOptions.getQueryParameters().forEach((_key, _value) -> { httpUrl.addQueryParameter(_key, _value); diff --git a/src/main/java/api/resources/tenants/requests/UsageTenantsRequest.java b/src/main/java/api/resources/tenants/requests/UsageTenantsRequest.java index a35fb29..68e5eba 100644 --- a/src/main/java/api/resources/tenants/requests/UsageTenantsRequest.java +++ b/src/main/java/api/resources/tenants/requests/UsageTenantsRequest.java @@ -22,10 +22,20 @@ public final class UsageTenantsRequest { private final Optional period; + private final Optional from; + + private final Optional to; + private final Map additionalProperties; - private UsageTenantsRequest(Optional period, Map additionalProperties) { + private UsageTenantsRequest( + Optional period, + Optional from, + Optional to, + Map additionalProperties) { this.period = period; + this.from = from; + this.to = to; this.additionalProperties = additionalProperties; } @@ -34,6 +44,16 @@ public Optional getPeriod() { return period; } + @JsonProperty("from") + public Optional getFrom() { + return from; + } + + @JsonProperty("to") + public Optional getTo() { + return to; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -46,12 +66,12 @@ public Map getAdditionalProperties() { } private boolean equalTo(UsageTenantsRequest other) { - return period.equals(other.period); + return period.equals(other.period) && from.equals(other.from) && to.equals(other.to); } @java.lang.Override public int hashCode() { - return Objects.hash(this.period); + return Objects.hash(this.period, this.from, this.to); } @java.lang.Override @@ -67,6 +87,10 @@ public static Builder builder() { public static final class Builder { private Optional period = Optional.empty(); + private Optional from = Optional.empty(); + + private Optional to = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -74,6 +98,8 @@ private Builder() {} public Builder from(UsageTenantsRequest other) { period(other.getPeriod()); + from(other.getFrom()); + to(other.getTo()); return this; } @@ -88,8 +114,30 @@ public Builder period(String period) { return this; } + @JsonSetter(value = "from", nulls = Nulls.SKIP) + public Builder from(Optional from) { + this.from = from; + return this; + } + + public Builder from(String from) { + this.from = Optional.ofNullable(from); + return this; + } + + @JsonSetter(value = "to", nulls = Nulls.SKIP) + public Builder to(Optional to) { + this.to = to; + return this; + } + + public Builder to(String to) { + this.to = Optional.ofNullable(to); + return this; + } + public UsageTenantsRequest build() { - return new UsageTenantsRequest(period, additionalProperties); + return new UsageTenantsRequest(period, from, to, additionalProperties); } public Builder additionalProperty(String key, Object value) { diff --git a/src/main/java/api/types/AnnotationCaret.java b/src/main/java/api/types/AnnotationCaret.java index 8bae4d6..af57261 100644 --- a/src/main/java/api/types/AnnotationCaret.java +++ b/src/main/java/api/types/AnnotationCaret.java @@ -88,6 +88,8 @@ public final class AnnotationCaret { private final Optional actions; + private final Optional richText; + private final String color; private final double opacity; @@ -132,6 +134,7 @@ private AnnotationCaret( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, String color, double opacity, AnnotationCaretBox box, @@ -169,6 +172,7 @@ private AnnotationCaret( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.box = box; @@ -380,6 +384,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public String getColor() { return color; @@ -507,6 +519,12 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("rotation") private Optional _getRotation() { @@ -562,6 +580,7 @@ private boolean equalTo(AnnotationCaret other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && box.equals(other.box) @@ -603,6 +622,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.box, @@ -796,6 +816,12 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + _FinalStage rotation(Optional rotation); _FinalStage rotation(Double rotation); @@ -870,6 +896,8 @@ public static final class Builder private Optional rotation = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -940,6 +968,7 @@ public Builder from(AnnotationCaret other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); box(other.getBox()); @@ -1124,6 +1153,31 @@ public _FinalStage rotation(Optional rotation) { return this; } + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1558,6 +1612,7 @@ public AnnotationCaret build() { modifiedBy, importedBy, actions, + richText, color, opacity, box, diff --git a/src/main/java/api/types/AnnotationCircle.java b/src/main/java/api/types/AnnotationCircle.java index abe1388..b031cd1 100644 --- a/src/main/java/api/types/AnnotationCircle.java +++ b/src/main/java/api/types/AnnotationCircle.java @@ -88,7 +88,9 @@ public final class AnnotationCircle { private final Optional actions; - private final String color; + private final Optional richText; + + private final Optional color; private final double opacity; @@ -140,7 +142,8 @@ private AnnotationCircle( Optional modifiedBy, Optional importedBy, Optional actions, - String color, + Optional richText, + Optional color, double opacity, double strokeWidth, AnnotationCircleBorderStyle borderStyle, @@ -181,6 +184,7 @@ private AnnotationCircle( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -396,8 +400,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") - public String getColor() { + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore + public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -549,6 +564,18 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -616,6 +643,7 @@ private boolean equalTo(AnnotationCircle other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && strokeWidth == other.strokeWidth @@ -661,6 +689,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -740,11 +769,7 @@ public interface ToggleNoViewStage { } public interface LockedContentsStage { - ColorStage lockedContents(boolean lockedContents); - } - - public interface ColorStage { - OpacityStage color(@NotNull String color); + OpacityStage lockedContents(boolean lockedContents); } public interface OpacityStage { @@ -866,6 +891,18 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + + _FinalStage color(Optional color); + + _FinalStage color(String color); + + _FinalStage color(Nullable color); + _FinalStage dashArray(Optional> dashArray); _FinalStage dashArray(List dashArray); @@ -908,7 +945,6 @@ public static final class Builder LockedStage, ToggleNoViewStage, LockedContentsStage, - ColorStage, OpacityStage, StrokeWidthStage, BorderStyleStage, @@ -944,8 +980,6 @@ public static final class Builder private boolean lockedContents; - private String color; - private double opacity; private double strokeWidth; @@ -962,6 +996,10 @@ public static final class Builder private Optional> dashArray = Optional.empty(); + private Optional color = Optional.empty(); + + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -1032,6 +1070,7 @@ public Builder from(AnnotationCircle other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1144,18 +1183,11 @@ public LockedContentsStage toggleNoView(boolean toggleNoView) { @java.lang.Override @JsonSetter("lockedContents") - public ColorStage lockedContents(boolean lockedContents) { + public OpacityStage lockedContents(boolean lockedContents) { this.lockedContents = lockedContents; return this; } - @java.lang.Override - @JsonSetter("color") - public OpacityStage color(@NotNull String color) { - this.color = Objects.requireNonNull(color, "color must not be null"); - return this; - } - @java.lang.Override @JsonSetter("opacity") public StrokeWidthStage opacity(double opacity) { @@ -1284,6 +1316,56 @@ public _FinalStage dashArray(Optional> dashArray) { return this; } + @java.lang.Override + public _FinalStage color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage color(String color) { + this.color = Optional.ofNullable(color); + return this; + } + + @java.lang.Override + @JsonSetter(value = "color", nulls = Nulls.SKIP) + public _FinalStage color(Optional color) { + this.color = color; + return this; + } + + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1718,6 +1800,7 @@ public AnnotationCircle build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationDraftCaret.java b/src/main/java/api/types/AnnotationDraftCaret.java index f509e03..636d8e2 100644 --- a/src/main/java/api/types/AnnotationDraftCaret.java +++ b/src/main/java/api/types/AnnotationDraftCaret.java @@ -85,6 +85,8 @@ public final class AnnotationDraftCaret { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -129,6 +131,7 @@ private AnnotationDraftCaret( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional box, @@ -166,6 +169,7 @@ private AnnotationDraftCaret( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.box = box; @@ -344,6 +348,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -405,6 +417,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("rotation") private Optional _getRotation() { @@ -460,6 +478,7 @@ private boolean equalTo(AnnotationDraftCaret other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && box.equals(other.box) @@ -501,6 +520,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.box, @@ -581,6 +601,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -628,6 +650,7 @@ public Builder from(AnnotationDraftCaret other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); box(other.getBox()); @@ -1032,6 +1055,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1142,6 +1187,7 @@ public AnnotationDraftCaret build() { modifiedBy, importedBy, actions, + richText, color, opacity, box, diff --git a/src/main/java/api/types/AnnotationDraftCircle.java b/src/main/java/api/types/AnnotationDraftCircle.java index 3ec98b4..d9dd668 100644 --- a/src/main/java/api/types/AnnotationDraftCircle.java +++ b/src/main/java/api/types/AnnotationDraftCircle.java @@ -86,6 +86,8 @@ public final class AnnotationDraftCircle { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -138,6 +140,7 @@ private AnnotationDraftCircle( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional strokeWidth, @@ -179,6 +182,7 @@ private AnnotationDraftCircle( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -361,8 +365,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -448,6 +463,18 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -515,6 +542,7 @@ private boolean equalTo(AnnotationDraftCircle other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && strokeWidth.equals(other.strokeWidth) @@ -560,6 +588,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -644,6 +673,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -699,6 +730,7 @@ public Builder from(AnnotationDraftCircle other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1107,6 +1139,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1118,6 +1172,17 @@ public Builder color(String color) { return this; } + public Builder color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + @JsonSetter(value = "opacity", nulls = Nulls.SKIP) public Builder opacity(Optional opacity) { this.opacity = opacity; @@ -1283,6 +1348,7 @@ public AnnotationDraftCircle build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationDraftFileAttachment.java b/src/main/java/api/types/AnnotationDraftFileAttachment.java index 6da2e9a..1f90431 100644 --- a/src/main/java/api/types/AnnotationDraftFileAttachment.java +++ b/src/main/java/api/types/AnnotationDraftFileAttachment.java @@ -86,6 +86,8 @@ public final class AnnotationDraftFileAttachment { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -128,6 +130,7 @@ private AnnotationDraftFileAttachment( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional icon, @@ -164,6 +167,7 @@ private AnnotationDraftFileAttachment( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.icon = icon; @@ -341,6 +345,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -394,6 +406,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("file") private Optional _getFile() { @@ -443,6 +461,7 @@ private boolean equalTo(AnnotationDraftFileAttachment other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && icon.equals(other.icon) @@ -483,6 +502,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.icon, @@ -641,6 +661,12 @@ public interface _FinalStage { _FinalStage actions(Object actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocumentInput richText); + + _FinalStage richText(Nullable richText); + _FinalStage color(Optional color); _FinalStage color(String color); @@ -672,6 +698,8 @@ public static final class Builder implements RectStage, _FinalStage { private Optional color = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -770,6 +798,7 @@ public Builder from(AnnotationDraftFileAttachment other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); icon(other.getIcon()); @@ -848,6 +877,31 @@ public _FinalStage color(Optional color) { return this; } + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Object actions) { this.actions = Optional.ofNullable(actions); @@ -1332,6 +1386,7 @@ public AnnotationDraftFileAttachment build() { modifiedBy, importedBy, actions, + richText, color, opacity, icon, diff --git a/src/main/java/api/types/AnnotationDraftFreeText.java b/src/main/java/api/types/AnnotationDraftFreeText.java index ec7ed16..54d1207 100644 --- a/src/main/java/api/types/AnnotationDraftFreeText.java +++ b/src/main/java/api/types/AnnotationDraftFreeText.java @@ -86,6 +86,8 @@ public final class AnnotationDraftFreeText { private final Optional actions; + private final Optional richText; + private final Optional box; private final Optional rotation; @@ -100,8 +102,6 @@ public final class AnnotationDraftFreeText { private final Optional verticalAlign; - private final Optional richText; - private final Optional color; private final Optional fontColor; @@ -156,6 +156,7 @@ private AnnotationDraftFreeText( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional box, Optional rotation, Optional intent, @@ -163,7 +164,6 @@ private AnnotationDraftFreeText( Optional fontSize, Optional textAlign, Optional verticalAlign, - Optional richText, Optional color, Optional fontColor, Optional interiorColor, @@ -206,6 +206,7 @@ private AnnotationDraftFreeText( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.box = box; this.rotation = rotation; this.intent = intent; @@ -213,7 +214,6 @@ private AnnotationDraftFreeText( this.fontSize = fontSize; this.textAlign = textAlign; this.verticalAlign = verticalAlign; - this.richText = richText; this.color = color; this.fontColor = fontColor; this.interiorColor = interiorColor; @@ -397,6 +397,11 @@ public Optional getActions() { return actions; } + @JsonProperty("richText") + public Optional getRichText() { + return richText; + } + @JsonProperty("box") public Optional getBox() { return box; @@ -435,11 +440,6 @@ public Optional getVerticalAlign() { return verticalAlign; } - @JsonProperty("richText") - public Optional getRichText() { - return richText; - } - @JsonProperty("color") public Optional getColor() { return color; @@ -614,6 +614,7 @@ private boolean equalTo(AnnotationDraftFreeText other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && box.equals(other.box) && rotation.equals(other.rotation) && intent.equals(other.intent) @@ -621,7 +622,6 @@ private boolean equalTo(AnnotationDraftFreeText other) { && fontSize.equals(other.fontSize) && textAlign.equals(other.textAlign) && verticalAlign.equals(other.verticalAlign) - && richText.equals(other.richText) && color.equals(other.color) && fontColor.equals(other.fontColor) && interiorColor.equals(other.interiorColor) @@ -668,6 +668,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.box, this.rotation, this.intent, @@ -675,7 +676,6 @@ public int hashCode() { this.fontSize, this.textAlign, this.verticalAlign, - this.richText, this.color, this.fontColor, this.interiorColor, @@ -761,6 +761,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional box = Optional.empty(); private Optional rotation = Optional.empty(); @@ -775,8 +777,6 @@ public static final class Builder { private Optional verticalAlign = Optional.empty(); - private Optional richText = Optional.empty(); - private Optional color = Optional.empty(); private Optional fontColor = Optional.empty(); @@ -834,6 +834,7 @@ public Builder from(AnnotationDraftFreeText other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); box(other.getBox()); rotation(other.getRotation()); intent(other.getIntent()); @@ -841,7 +842,6 @@ public Builder from(AnnotationDraftFreeText other) { fontSize(other.getFontSize()); textAlign(other.getTextAlign()); verticalAlign(other.getVerticalAlign()); - richText(other.getRichText()); color(other.getColor()); fontColor(other.getFontColor()); interiorColor(other.getInteriorColor()); @@ -1251,6 +1251,17 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + @JsonSetter(value = "box", nulls = Nulls.SKIP) public Builder box(Optional box) { this.box = box; @@ -1339,17 +1350,6 @@ public Builder verticalAlign(AnnotationDraftFreeTextVerticalAlign verticalAlign) return this; } - @JsonSetter(value = "richText", nulls = Nulls.SKIP) - public Builder richText(Optional richText) { - this.richText = richText; - return this; - } - - public Builder richText(AnnotationDraftFreeTextRichText richText) { - this.richText = Optional.ofNullable(richText); - return this; - } - @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1548,6 +1548,7 @@ public AnnotationDraftFreeText build() { modifiedBy, importedBy, actions, + richText, box, rotation, intent, @@ -1555,7 +1556,6 @@ public AnnotationDraftFreeText build() { fontSize, textAlign, verticalAlign, - richText, color, fontColor, interiorColor, diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItem.java b/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItem.java deleted file mode 100644 index c03e1cc..0000000 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItem.java +++ /dev/null @@ -1,266 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.cloudpdf.api.core.ObjectMappers; -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 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 = AnnotationDraftFreeTextRichTextParagraphsItem.Builder.class) -public final class AnnotationDraftFreeTextRichTextParagraphsItem { - private final Optional align; - - private final Optional dir; - - private final Optional lineHeight; - - private final Optional margins; - - private final Optional textIndent; - - private final Optional unknown; - - private final List runs; - - private final Map additionalProperties; - - private AnnotationDraftFreeTextRichTextParagraphsItem( - Optional align, - Optional dir, - Optional lineHeight, - Optional margins, - Optional textIndent, - Optional unknown, - List runs, - Map additionalProperties) { - this.align = align; - this.dir = dir; - this.lineHeight = lineHeight; - this.margins = margins; - this.textIndent = textIndent; - this.unknown = unknown; - this.runs = runs; - this.additionalProperties = additionalProperties; - } - - @JsonProperty("align") - public Optional getAlign() { - return align; - } - - @JsonProperty("dir") - public Optional getDir() { - return dir; - } - - @JsonProperty("lineHeight") - public Optional getLineHeight() { - return lineHeight; - } - - @JsonProperty("margins") - public Optional getMargins() { - return margins; - } - - @JsonProperty("textIndent") - public Optional getTextIndent() { - return textIndent; - } - - @JsonProperty("unknown") - public Optional getUnknown() { - return unknown; - } - - @JsonProperty("runs") - public List getRuns() { - return runs; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof AnnotationDraftFreeTextRichTextParagraphsItem - && equalTo((AnnotationDraftFreeTextRichTextParagraphsItem) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(AnnotationDraftFreeTextRichTextParagraphsItem other) { - return align.equals(other.align) - && dir.equals(other.dir) - && lineHeight.equals(other.lineHeight) - && margins.equals(other.margins) - && textIndent.equals(other.textIndent) - && unknown.equals(other.unknown) - && runs.equals(other.runs); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash( - this.align, this.dir, this.lineHeight, this.margins, this.textIndent, this.unknown, this.runs); - } - - @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 align = Optional.empty(); - - private Optional dir = Optional.empty(); - - private Optional lineHeight = Optional.empty(); - - private Optional margins = Optional.empty(); - - private Optional textIndent = Optional.empty(); - - private Optional unknown = Optional.empty(); - - private List runs = new ArrayList<>(); - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - public Builder from(AnnotationDraftFreeTextRichTextParagraphsItem other) { - align(other.getAlign()); - dir(other.getDir()); - lineHeight(other.getLineHeight()); - margins(other.getMargins()); - textIndent(other.getTextIndent()); - unknown(other.getUnknown()); - runs(other.getRuns()); - return this; - } - - @JsonSetter(value = "align", nulls = Nulls.SKIP) - public Builder align(Optional align) { - this.align = align; - return this; - } - - public Builder align(AnnotationDraftFreeTextRichTextParagraphsItemAlign align) { - this.align = Optional.ofNullable(align); - return this; - } - - @JsonSetter(value = "dir", nulls = Nulls.SKIP) - public Builder dir(Optional dir) { - this.dir = dir; - return this; - } - - public Builder dir(AnnotationDraftFreeTextRichTextParagraphsItemDir dir) { - this.dir = Optional.ofNullable(dir); - return this; - } - - @JsonSetter(value = "lineHeight", nulls = Nulls.SKIP) - public Builder lineHeight(Optional lineHeight) { - this.lineHeight = lineHeight; - return this; - } - - public Builder lineHeight(Double lineHeight) { - this.lineHeight = Optional.ofNullable(lineHeight); - return this; - } - - @JsonSetter(value = "margins", nulls = Nulls.SKIP) - public Builder margins(Optional margins) { - this.margins = margins; - return this; - } - - public Builder margins(AnnotationDraftFreeTextRichTextParagraphsItemMargins margins) { - this.margins = Optional.ofNullable(margins); - return this; - } - - @JsonSetter(value = "textIndent", nulls = Nulls.SKIP) - public Builder textIndent(Optional textIndent) { - this.textIndent = textIndent; - return this; - } - - public Builder textIndent(Double textIndent) { - this.textIndent = Optional.ofNullable(textIndent); - return this; - } - - @JsonSetter(value = "unknown", nulls = Nulls.SKIP) - public Builder unknown(Optional unknown) { - this.unknown = unknown; - return this; - } - - public Builder unknown(String unknown) { - this.unknown = Optional.ofNullable(unknown); - return this; - } - - @JsonSetter(value = "runs", nulls = Nulls.SKIP) - public Builder runs(List runs) { - this.runs.clear(); - if (runs != null) { - this.runs.addAll(runs); - } - return this; - } - - public Builder addRuns(AnnotationDraftFreeTextRichTextParagraphsItemRunsItem runs) { - this.runs.add(runs); - return this; - } - - public Builder addAllRuns(List runs) { - if (runs != null) { - this.runs.addAll(runs); - } - return this; - } - - public AnnotationDraftFreeTextRichTextParagraphsItem build() { - return new AnnotationDraftFreeTextRichTextParagraphsItem( - align, dir, lineHeight, margins, textIndent, unknown, runs, additionalProperties); - } - - public Builder additionalProperty(String key, Object value) { - this.additionalProperties.put(key, value); - return this; - } - - public Builder additionalProperties(Map additionalProperties) { - this.additionalProperties.putAll(additionalProperties); - return this; - } - } -} diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemAlign.java b/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemAlign.java deleted file mode 100644 index e47e570..0000000 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemAlign.java +++ /dev/null @@ -1,108 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -public final class AnnotationDraftFreeTextRichTextParagraphsItemAlign { - public static final AnnotationDraftFreeTextRichTextParagraphsItemAlign JUSTIFY = - new AnnotationDraftFreeTextRichTextParagraphsItemAlign(Value.JUSTIFY, "justify"); - - public static final AnnotationDraftFreeTextRichTextParagraphsItemAlign LEFT = - new AnnotationDraftFreeTextRichTextParagraphsItemAlign(Value.LEFT, "left"); - - public static final AnnotationDraftFreeTextRichTextParagraphsItemAlign RIGHT = - new AnnotationDraftFreeTextRichTextParagraphsItemAlign(Value.RIGHT, "right"); - - public static final AnnotationDraftFreeTextRichTextParagraphsItemAlign CENTER = - new AnnotationDraftFreeTextRichTextParagraphsItemAlign(Value.CENTER, "center"); - - private final Value value; - - private final String string; - - AnnotationDraftFreeTextRichTextParagraphsItemAlign(Value value, String string) { - this.value = value; - this.string = string; - } - - public Value getEnumValue() { - return value; - } - - @java.lang.Override - @JsonValue - public String toString() { - return this.string; - } - - @java.lang.Override - public boolean equals(Object other) { - return (this == other) - || (other instanceof AnnotationDraftFreeTextRichTextParagraphsItemAlign - && this.string.equals(((AnnotationDraftFreeTextRichTextParagraphsItemAlign) other).string)); - } - - @java.lang.Override - public int hashCode() { - return this.string.hashCode(); - } - - public T visit(Visitor visitor) { - switch (value) { - case JUSTIFY: - return visitor.visitJustify(); - case LEFT: - return visitor.visitLeft(); - case RIGHT: - return visitor.visitRight(); - case CENTER: - return visitor.visitCenter(); - case UNKNOWN: - default: - return visitor.visitUnknown(string); - } - } - - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationDraftFreeTextRichTextParagraphsItemAlign valueOf(String value) { - switch (value) { - case "justify": - return JUSTIFY; - case "left": - return LEFT; - case "right": - return RIGHT; - case "center": - return CENTER; - default: - return new AnnotationDraftFreeTextRichTextParagraphsItemAlign(Value.UNKNOWN, value); - } - } - - public enum Value { - LEFT, - - CENTER, - - RIGHT, - - JUSTIFY, - - UNKNOWN - } - - public interface Visitor { - T visitLeft(); - - T visitCenter(); - - T visitRight(); - - T visitJustify(); - - T visitUnknown(String unknownType); - } -} diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemDir.java b/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemDir.java deleted file mode 100644 index 7313a40..0000000 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemDir.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -public final class AnnotationDraftFreeTextRichTextParagraphsItemDir { - public static final AnnotationDraftFreeTextRichTextParagraphsItemDir LTR = - new AnnotationDraftFreeTextRichTextParagraphsItemDir(Value.LTR, "ltr"); - - public static final AnnotationDraftFreeTextRichTextParagraphsItemDir RTL = - new AnnotationDraftFreeTextRichTextParagraphsItemDir(Value.RTL, "rtl"); - - private final Value value; - - private final String string; - - AnnotationDraftFreeTextRichTextParagraphsItemDir(Value value, String string) { - this.value = value; - this.string = string; - } - - public Value getEnumValue() { - return value; - } - - @java.lang.Override - @JsonValue - public String toString() { - return this.string; - } - - @java.lang.Override - public boolean equals(Object other) { - return (this == other) - || (other instanceof AnnotationDraftFreeTextRichTextParagraphsItemDir - && this.string.equals(((AnnotationDraftFreeTextRichTextParagraphsItemDir) other).string)); - } - - @java.lang.Override - public int hashCode() { - return this.string.hashCode(); - } - - public T visit(Visitor visitor) { - switch (value) { - case LTR: - return visitor.visitLtr(); - case RTL: - return visitor.visitRtl(); - case UNKNOWN: - default: - return visitor.visitUnknown(string); - } - } - - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationDraftFreeTextRichTextParagraphsItemDir valueOf(String value) { - switch (value) { - case "ltr": - return LTR; - case "rtl": - return RTL; - default: - return new AnnotationDraftFreeTextRichTextParagraphsItemDir(Value.UNKNOWN, value); - } - } - - public enum Value { - LTR, - - RTL, - - UNKNOWN - } - - public interface Visitor { - T visitLtr(); - - T visitRtl(); - - T visitUnknown(String unknownType); - } -} diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemMargins.java b/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemMargins.java deleted file mode 100644 index 1f78018..0000000 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemMargins.java +++ /dev/null @@ -1,186 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.cloudpdf.api.core.ObjectMappers; -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 java.util.HashMap; -import java.util.Map; -import java.util.Objects; - -@JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationDraftFreeTextRichTextParagraphsItemMargins.Builder.class) -public final class AnnotationDraftFreeTextRichTextParagraphsItemMargins { - private final double top; - - private final double bottom; - - private final double left; - - private final double right; - - private final Map additionalProperties; - - private AnnotationDraftFreeTextRichTextParagraphsItemMargins( - double top, double bottom, double left, double right, Map additionalProperties) { - this.top = top; - this.bottom = bottom; - this.left = left; - this.right = right; - this.additionalProperties = additionalProperties; - } - - @JsonProperty("top") - public double getTop() { - return top; - } - - @JsonProperty("bottom") - public double getBottom() { - return bottom; - } - - @JsonProperty("left") - public double getLeft() { - return left; - } - - @JsonProperty("right") - public double getRight() { - return right; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof AnnotationDraftFreeTextRichTextParagraphsItemMargins - && equalTo((AnnotationDraftFreeTextRichTextParagraphsItemMargins) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(AnnotationDraftFreeTextRichTextParagraphsItemMargins other) { - return top == other.top && bottom == other.bottom && left == other.left && right == other.right; - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.top, this.bottom, this.left, this.right); - } - - @java.lang.Override - public String toString() { - return ObjectMappers.stringify(this); - } - - public static TopStage builder() { - return new Builder(); - } - - public interface TopStage { - BottomStage top(double top); - - Builder from(AnnotationDraftFreeTextRichTextParagraphsItemMargins other); - } - - public interface BottomStage { - LeftStage bottom(double bottom); - } - - public interface LeftStage { - RightStage left(double left); - } - - public interface RightStage { - _FinalStage right(double right); - } - - public interface _FinalStage { - AnnotationDraftFreeTextRichTextParagraphsItemMargins build(); - - _FinalStage additionalProperty(String key, Object value); - - _FinalStage additionalProperties(Map additionalProperties); - } - - @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements TopStage, BottomStage, LeftStage, RightStage, _FinalStage { - private double top; - - private double bottom; - - private double left; - - private double right; - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - @java.lang.Override - public Builder from(AnnotationDraftFreeTextRichTextParagraphsItemMargins other) { - top(other.getTop()); - bottom(other.getBottom()); - left(other.getLeft()); - right(other.getRight()); - return this; - } - - @java.lang.Override - @JsonSetter("top") - public BottomStage top(double top) { - this.top = top; - return this; - } - - @java.lang.Override - @JsonSetter("bottom") - public LeftStage bottom(double bottom) { - this.bottom = bottom; - return this; - } - - @java.lang.Override - @JsonSetter("left") - public RightStage left(double left) { - this.left = left; - return this; - } - - @java.lang.Override - @JsonSetter("right") - public _FinalStage right(double right) { - this.right = right; - return this; - } - - @java.lang.Override - public AnnotationDraftFreeTextRichTextParagraphsItemMargins build() { - return new AnnotationDraftFreeTextRichTextParagraphsItemMargins( - top, bottom, left, right, additionalProperties); - } - - @java.lang.Override - public Builder additionalProperty(String key, Object value) { - this.additionalProperties.put(key, value); - return this; - } - - @java.lang.Override - public Builder additionalProperties(Map additionalProperties) { - this.additionalProperties.putAll(additionalProperties); - return this; - } - } -} diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItem.java b/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItem.java deleted file mode 100644 index b059136..0000000 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItem.java +++ /dev/null @@ -1,152 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.cloudpdf.api.core.ObjectMappers; -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 java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import org.jetbrains.annotations.NotNull; - -@JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationDraftFreeTextRichTextParagraphsItemRunsItem.Builder.class) -public final class AnnotationDraftFreeTextRichTextParagraphsItemRunsItem { - private final String text; - - private final Optional style; - - private final Map additionalProperties; - - private AnnotationDraftFreeTextRichTextParagraphsItemRunsItem( - String text, - Optional style, - Map additionalProperties) { - this.text = text; - this.style = style; - this.additionalProperties = additionalProperties; - } - - @JsonProperty("text") - public String getText() { - return text; - } - - @JsonProperty("style") - public Optional getStyle() { - return style; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof AnnotationDraftFreeTextRichTextParagraphsItemRunsItem - && equalTo((AnnotationDraftFreeTextRichTextParagraphsItemRunsItem) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(AnnotationDraftFreeTextRichTextParagraphsItemRunsItem other) { - return text.equals(other.text) && style.equals(other.style); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.text, this.style); - } - - @java.lang.Override - public String toString() { - return ObjectMappers.stringify(this); - } - - public static TextStage builder() { - return new Builder(); - } - - public interface TextStage { - _FinalStage text(@NotNull String text); - - Builder from(AnnotationDraftFreeTextRichTextParagraphsItemRunsItem other); - } - - public interface _FinalStage { - AnnotationDraftFreeTextRichTextParagraphsItemRunsItem build(); - - _FinalStage additionalProperty(String key, Object value); - - _FinalStage additionalProperties(Map additionalProperties); - - _FinalStage style(Optional style); - - _FinalStage style(AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle style); - } - - @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements TextStage, _FinalStage { - private String text; - - private Optional style = Optional.empty(); - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - @java.lang.Override - public Builder from(AnnotationDraftFreeTextRichTextParagraphsItemRunsItem other) { - text(other.getText()); - style(other.getStyle()); - return this; - } - - @java.lang.Override - @JsonSetter("text") - public _FinalStage text(@NotNull String text) { - this.text = Objects.requireNonNull(text, "text must not be null"); - return this; - } - - @java.lang.Override - public _FinalStage style(AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle style) { - this.style = Optional.ofNullable(style); - return this; - } - - @java.lang.Override - @JsonSetter(value = "style", nulls = Nulls.SKIP) - public _FinalStage style(Optional style) { - this.style = style; - return this; - } - - @java.lang.Override - public AnnotationDraftFreeTextRichTextParagraphsItemRunsItem build() { - return new AnnotationDraftFreeTextRichTextParagraphsItemRunsItem(text, style, additionalProperties); - } - - @java.lang.Override - public Builder additionalProperty(String key, Object value) { - this.additionalProperties.put(key, value); - return this; - } - - @java.lang.Override - public Builder additionalProperties(Map additionalProperties) { - this.additionalProperties.putAll(additionalProperties); - return this; - } - } -} diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle.java b/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle.java deleted file mode 100644 index 8c16d4a..0000000 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle.java +++ /dev/null @@ -1,349 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.cloudpdf.api.core.ObjectMappers; -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 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 = AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle.Builder.class) -public final class AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle { - private final Optional family; - - private final Optional weight; - - private final Optional italic; - - private final Optional size; - - private final Optional color; - - private final Optional> decoration; - - private final Optional script; - - private final Optional letterSpacing; - - private final Optional horizontalScale; - - private final Optional unknown; - - private final Map additionalProperties; - - private AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle( - Optional family, - Optional weight, - Optional italic, - Optional size, - Optional color, - Optional> decoration, - Optional script, - Optional letterSpacing, - Optional horizontalScale, - Optional unknown, - Map additionalProperties) { - this.family = family; - this.weight = weight; - this.italic = italic; - this.size = size; - this.color = color; - this.decoration = decoration; - this.script = script; - this.letterSpacing = letterSpacing; - this.horizontalScale = horizontalScale; - this.unknown = unknown; - this.additionalProperties = additionalProperties; - } - - @JsonProperty("family") - public Optional getFamily() { - return family; - } - - @JsonProperty("weight") - public Optional getWeight() { - return weight; - } - - @JsonProperty("italic") - public Optional getItalic() { - return italic; - } - - @JsonProperty("size") - public Optional getSize() { - return size; - } - - @JsonProperty("color") - public Optional getColor() { - return color; - } - - @JsonProperty("decoration") - public Optional> getDecoration() { - return decoration; - } - - @JsonProperty("script") - public Optional getScript() { - return script; - } - - @JsonProperty("letterSpacing") - public Optional getLetterSpacing() { - return letterSpacing; - } - - @JsonProperty("horizontalScale") - public Optional getHorizontalScale() { - return horizontalScale; - } - - @JsonProperty("unknown") - public Optional getUnknown() { - return unknown; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle - && equalTo((AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle other) { - return family.equals(other.family) - && weight.equals(other.weight) - && italic.equals(other.italic) - && size.equals(other.size) - && color.equals(other.color) - && decoration.equals(other.decoration) - && script.equals(other.script) - && letterSpacing.equals(other.letterSpacing) - && horizontalScale.equals(other.horizontalScale) - && unknown.equals(other.unknown); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash( - this.family, - this.weight, - this.italic, - this.size, - this.color, - this.decoration, - this.script, - this.letterSpacing, - this.horizontalScale, - this.unknown); - } - - @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 family = Optional.empty(); - - private Optional weight = Optional.empty(); - - private Optional italic = Optional.empty(); - - private Optional size = Optional.empty(); - - private Optional color = Optional.empty(); - - private Optional> decoration = - Optional.empty(); - - private Optional script = Optional.empty(); - - private Optional letterSpacing = Optional.empty(); - - private Optional horizontalScale = Optional.empty(); - - private Optional unknown = Optional.empty(); - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - public Builder from(AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle other) { - family(other.getFamily()); - weight(other.getWeight()); - italic(other.getItalic()); - size(other.getSize()); - color(other.getColor()); - decoration(other.getDecoration()); - script(other.getScript()); - letterSpacing(other.getLetterSpacing()); - horizontalScale(other.getHorizontalScale()); - unknown(other.getUnknown()); - return this; - } - - @JsonSetter(value = "family", nulls = Nulls.SKIP) - public Builder family(Optional family) { - this.family = family; - return this; - } - - public Builder family(String family) { - this.family = Optional.ofNullable(family); - return this; - } - - @JsonSetter(value = "weight", nulls = Nulls.SKIP) - public Builder weight(Optional weight) { - this.weight = weight; - return this; - } - - public Builder weight(Integer weight) { - this.weight = Optional.ofNullable(weight); - return this; - } - - @JsonSetter(value = "italic", nulls = Nulls.SKIP) - public Builder italic(Optional italic) { - this.italic = italic; - return this; - } - - public Builder italic(Boolean italic) { - this.italic = Optional.ofNullable(italic); - return this; - } - - @JsonSetter(value = "size", nulls = Nulls.SKIP) - public Builder size(Optional size) { - this.size = size; - return this; - } - - public Builder size(Double size) { - this.size = Optional.ofNullable(size); - return this; - } - - @JsonSetter(value = "color", nulls = Nulls.SKIP) - public Builder color(Optional color) { - this.color = color; - return this; - } - - public Builder color(String color) { - this.color = Optional.ofNullable(color); - return this; - } - - @JsonSetter(value = "decoration", nulls = Nulls.SKIP) - public Builder decoration( - Optional> decoration) { - this.decoration = decoration; - return this; - } - - public Builder decoration( - List decoration) { - this.decoration = Optional.ofNullable(decoration); - return this; - } - - @JsonSetter(value = "script", nulls = Nulls.SKIP) - public Builder script(Optional script) { - this.script = script; - return this; - } - - public Builder script(AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript script) { - this.script = Optional.ofNullable(script); - return this; - } - - @JsonSetter(value = "letterSpacing", nulls = Nulls.SKIP) - public Builder letterSpacing(Optional letterSpacing) { - this.letterSpacing = letterSpacing; - return this; - } - - public Builder letterSpacing(Double letterSpacing) { - this.letterSpacing = Optional.ofNullable(letterSpacing); - return this; - } - - @JsonSetter(value = "horizontalScale", nulls = Nulls.SKIP) - public Builder horizontalScale(Optional horizontalScale) { - this.horizontalScale = horizontalScale; - return this; - } - - public Builder horizontalScale(Double horizontalScale) { - this.horizontalScale = Optional.ofNullable(horizontalScale); - return this; - } - - @JsonSetter(value = "unknown", nulls = Nulls.SKIP) - public Builder unknown(Optional unknown) { - this.unknown = unknown; - return this; - } - - public Builder unknown(String unknown) { - this.unknown = Optional.ofNullable(unknown); - return this; - } - - public AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle build() { - return new AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyle( - family, - weight, - italic, - size, - color, - decoration, - script, - letterSpacing, - horizontalScale, - unknown, - additionalProperties); - } - - public Builder additionalProperty(String key, Object value) { - this.additionalProperties.put(key, value); - return this; - } - - public Builder additionalProperties(Map additionalProperties) { - this.additionalProperties.putAll(additionalProperties); - return this; - } - } -} diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem.java b/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem.java deleted file mode 100644 index de194dd..0000000 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -public final class AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem { - public static final AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem WORD = - new AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem(Value.WORD, "word"); - - public static final AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem UNDERLINE = - new AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem(Value.UNDERLINE, "underline"); - - public static final AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem LINE_THROUGH = - new AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem( - Value.LINE_THROUGH, "line-through"); - - private final Value value; - - private final String string; - - AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem(Value value, String string) { - this.value = value; - this.string = string; - } - - public Value getEnumValue() { - return value; - } - - @java.lang.Override - @JsonValue - public String toString() { - return this.string; - } - - @java.lang.Override - public boolean equals(Object other) { - return (this == other) - || (other instanceof AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem - && this.string.equals( - ((AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem) other) - .string)); - } - - @java.lang.Override - public int hashCode() { - return this.string.hashCode(); - } - - public T visit(Visitor visitor) { - switch (value) { - case WORD: - return visitor.visitWord(); - case UNDERLINE: - return visitor.visitUnderline(); - case LINE_THROUGH: - return visitor.visitLineThrough(); - case UNKNOWN: - default: - return visitor.visitUnknown(string); - } - } - - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem valueOf(String value) { - switch (value) { - case "word": - return WORD; - case "underline": - return UNDERLINE; - case "line-through": - return LINE_THROUGH; - default: - return new AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem( - Value.UNKNOWN, value); - } - } - - public enum Value { - UNDERLINE, - - LINE_THROUGH, - - WORD, - - UNKNOWN - } - - public interface Visitor { - T visitUnderline(); - - T visitLineThrough(); - - T visitWord(); - - T visitUnknown(String unknownType); - } -} diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript.java b/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript.java deleted file mode 100644 index 1cfd015..0000000 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -public final class AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript { - public static final AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript SUB = - new AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript(Value.SUB, "sub"); - - public static final AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript NORMAL = - new AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript(Value.NORMAL, "normal"); - - public static final AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript SUPER = - new AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript(Value.SUPER, "super"); - - private final Value value; - - private final String string; - - AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript(Value value, String string) { - this.value = value; - this.string = string; - } - - public Value getEnumValue() { - return value; - } - - @java.lang.Override - @JsonValue - public String toString() { - return this.string; - } - - @java.lang.Override - public boolean equals(Object other) { - return (this == other) - || (other instanceof AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript - && this.string.equals( - ((AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript) other).string)); - } - - @java.lang.Override - public int hashCode() { - return this.string.hashCode(); - } - - public T visit(Visitor visitor) { - switch (value) { - case SUB: - return visitor.visitSub(); - case NORMAL: - return visitor.visitNormal(); - case SUPER: - return visitor.visitSuper(); - case UNKNOWN: - default: - return visitor.visitUnknown(string); - } - } - - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript valueOf(String value) { - switch (value) { - case "sub": - return SUB; - case "normal": - return NORMAL; - case "super": - return SUPER; - default: - return new AnnotationDraftFreeTextRichTextParagraphsItemRunsItemStyleScript(Value.UNKNOWN, value); - } - } - - public enum Value { - NORMAL, - - SUB, - - SUPER, - - UNKNOWN - } - - public interface Visitor { - T visitNormal(); - - T visitSub(); - - T visitSuper(); - - T visitUnknown(String unknownType); - } -} diff --git a/src/main/java/api/types/AnnotationDraftHighlight.java b/src/main/java/api/types/AnnotationDraftHighlight.java index a8596e7..9d52759 100644 --- a/src/main/java/api/types/AnnotationDraftHighlight.java +++ b/src/main/java/api/types/AnnotationDraftHighlight.java @@ -87,6 +87,8 @@ public final class AnnotationDraftHighlight { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -127,6 +129,7 @@ private AnnotationDraftHighlight( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, List quadPoints, @@ -162,6 +165,7 @@ private AnnotationDraftHighlight( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -338,6 +342,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -383,6 +395,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -426,6 +444,7 @@ private boolean equalTo(AnnotationDraftHighlight other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && quadPoints.equals(other.quadPoints); @@ -465,6 +484,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints); @@ -543,6 +563,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -586,6 +608,7 @@ public Builder from(AnnotationDraftHighlight other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -988,6 +1011,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1064,6 +1109,7 @@ public AnnotationDraftHighlight build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationDraftInk.java b/src/main/java/api/types/AnnotationDraftInk.java index 57fe5c1..fd04ba6 100644 --- a/src/main/java/api/types/AnnotationDraftInk.java +++ b/src/main/java/api/types/AnnotationDraftInk.java @@ -87,6 +87,8 @@ public final class AnnotationDraftInk { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -137,6 +139,7 @@ private AnnotationDraftInk( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional strokeWidth, @@ -177,6 +180,7 @@ private AnnotationDraftInk( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -358,8 +362,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -437,6 +452,18 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -498,6 +525,7 @@ private boolean equalTo(AnnotationDraftInk other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && strokeWidth.equals(other.strokeWidth) @@ -542,6 +570,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -625,6 +654,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -678,6 +709,7 @@ public Builder from(AnnotationDraftInk other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1085,6 +1117,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1096,6 +1150,17 @@ public Builder color(String color) { return this; } + public Builder color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + @JsonSetter(value = "opacity", nulls = Nulls.SKIP) public Builder opacity(Optional opacity) { this.opacity = opacity; @@ -1249,6 +1314,7 @@ public AnnotationDraftInk build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationDraftLine.java b/src/main/java/api/types/AnnotationDraftLine.java index 18d8816..c3bb77f 100644 --- a/src/main/java/api/types/AnnotationDraftLine.java +++ b/src/main/java/api/types/AnnotationDraftLine.java @@ -87,6 +87,8 @@ public final class AnnotationDraftLine { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -151,6 +153,7 @@ private AnnotationDraftLine( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional strokeWidth, @@ -198,6 +201,7 @@ private AnnotationDraftLine( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -386,8 +390,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -515,6 +530,18 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -606,6 +633,7 @@ private boolean equalTo(AnnotationDraftLine other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && strokeWidth.equals(other.strokeWidth) @@ -657,6 +685,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -830,10 +859,18 @@ public interface _FinalStage { _FinalStage actions(Object actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocumentInput richText); + + _FinalStage richText(Nullable richText); + _FinalStage color(Optional color); _FinalStage color(String color); + _FinalStage color(Nullable color); + _FinalStage opacity(Optional opacity); _FinalStage opacity(Double opacity); @@ -935,6 +972,8 @@ public static final class Builder implements LinePointsStage, _FinalStage { private Optional color = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -1035,6 +1074,7 @@ public Builder from(AnnotationDraftLine other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1325,6 +1365,18 @@ public _FinalStage opacity(Optional opacity) { return this; } + @java.lang.Override + public _FinalStage color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + @java.lang.Override public _FinalStage color(String color) { this.color = Optional.ofNullable(color); @@ -1338,6 +1390,31 @@ public _FinalStage color(Optional color) { return this; } + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Object actions) { this.actions = Optional.ofNullable(actions); @@ -1835,6 +1912,7 @@ public AnnotationDraftLine build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationDraftPolygon.java b/src/main/java/api/types/AnnotationDraftPolygon.java index 746bf6d..d61c57e 100644 --- a/src/main/java/api/types/AnnotationDraftPolygon.java +++ b/src/main/java/api/types/AnnotationDraftPolygon.java @@ -87,6 +87,8 @@ public final class AnnotationDraftPolygon { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -147,6 +149,7 @@ private AnnotationDraftPolygon( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional strokeWidth, @@ -192,6 +195,7 @@ private AnnotationDraftPolygon( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -378,8 +382,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -497,6 +512,18 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -588,6 +615,7 @@ private boolean equalTo(AnnotationDraftPolygon other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && strokeWidth.equals(other.strokeWidth) @@ -637,6 +665,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -725,6 +754,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -788,6 +819,7 @@ public Builder from(AnnotationDraftPolygon other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1200,6 +1232,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1211,6 +1265,17 @@ public Builder color(String color) { return this; } + public Builder color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + @JsonSetter(value = "opacity", nulls = Nulls.SKIP) public Builder opacity(Optional opacity) { this.opacity = opacity; @@ -1474,6 +1539,7 @@ public AnnotationDraftPolygon build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationDraftPolyline.java b/src/main/java/api/types/AnnotationDraftPolyline.java index 2d41064..c6537db 100644 --- a/src/main/java/api/types/AnnotationDraftPolyline.java +++ b/src/main/java/api/types/AnnotationDraftPolyline.java @@ -87,6 +87,8 @@ public final class AnnotationDraftPolyline { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -147,6 +149,7 @@ private AnnotationDraftPolyline( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional strokeWidth, @@ -192,6 +195,7 @@ private AnnotationDraftPolyline( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -378,8 +382,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -494,6 +509,18 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -579,6 +606,7 @@ private boolean equalTo(AnnotationDraftPolyline other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && strokeWidth.equals(other.strokeWidth) @@ -628,6 +656,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -716,6 +745,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -779,6 +810,7 @@ public Builder from(AnnotationDraftPolyline other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1191,6 +1223,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1202,6 +1256,17 @@ public Builder color(String color) { return this; } + public Builder color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + @JsonSetter(value = "opacity", nulls = Nulls.SKIP) public Builder opacity(Optional opacity) { this.opacity = opacity; @@ -1454,6 +1519,7 @@ public AnnotationDraftPolyline build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationDraftRedact.java b/src/main/java/api/types/AnnotationDraftRedact.java index 584cdc4..b2aaed2 100644 --- a/src/main/java/api/types/AnnotationDraftRedact.java +++ b/src/main/java/api/types/AnnotationDraftRedact.java @@ -86,6 +86,8 @@ public final class AnnotationDraftRedact { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -140,6 +142,7 @@ private AnnotationDraftRedact( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional> quadPoints, @@ -182,6 +185,7 @@ private AnnotationDraftRedact( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -365,6 +369,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -451,6 +463,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("interiorColor") private Optional _getInteriorColor() { @@ -506,6 +524,7 @@ private boolean equalTo(AnnotationDraftRedact other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && quadPoints.equals(other.quadPoints) @@ -552,6 +571,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints, @@ -637,6 +657,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -694,6 +716,7 @@ public Builder from(AnnotationDraftRedact other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -1103,6 +1126,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1268,6 +1313,7 @@ public AnnotationDraftRedact build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationDraftSquare.java b/src/main/java/api/types/AnnotationDraftSquare.java index 37a0e2e..8330dcd 100644 --- a/src/main/java/api/types/AnnotationDraftSquare.java +++ b/src/main/java/api/types/AnnotationDraftSquare.java @@ -86,6 +86,8 @@ public final class AnnotationDraftSquare { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -138,6 +140,7 @@ private AnnotationDraftSquare( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional strokeWidth, @@ -179,6 +182,7 @@ private AnnotationDraftSquare( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -361,8 +365,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -448,6 +463,18 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -515,6 +542,7 @@ private boolean equalTo(AnnotationDraftSquare other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && strokeWidth.equals(other.strokeWidth) @@ -560,6 +588,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -644,6 +673,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -699,6 +730,7 @@ public Builder from(AnnotationDraftSquare other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1107,6 +1139,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1118,6 +1172,17 @@ public Builder color(String color) { return this; } + public Builder color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + @JsonSetter(value = "opacity", nulls = Nulls.SKIP) public Builder opacity(Optional opacity) { this.opacity = opacity; @@ -1283,6 +1348,7 @@ public AnnotationDraftSquare build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationDraftSquiggly.java b/src/main/java/api/types/AnnotationDraftSquiggly.java index 0d9830e..bb60911 100644 --- a/src/main/java/api/types/AnnotationDraftSquiggly.java +++ b/src/main/java/api/types/AnnotationDraftSquiggly.java @@ -87,6 +87,8 @@ public final class AnnotationDraftSquiggly { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -127,6 +129,7 @@ private AnnotationDraftSquiggly( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, List quadPoints, @@ -162,6 +165,7 @@ private AnnotationDraftSquiggly( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -338,6 +342,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -383,6 +395,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -426,6 +444,7 @@ private boolean equalTo(AnnotationDraftSquiggly other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && quadPoints.equals(other.quadPoints); @@ -465,6 +484,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints); @@ -543,6 +563,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -586,6 +608,7 @@ public Builder from(AnnotationDraftSquiggly other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -988,6 +1011,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1064,6 +1109,7 @@ public AnnotationDraftSquiggly build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationDraftStamp.java b/src/main/java/api/types/AnnotationDraftStamp.java index fe260c3..ad24877 100644 --- a/src/main/java/api/types/AnnotationDraftStamp.java +++ b/src/main/java/api/types/AnnotationDraftStamp.java @@ -85,6 +85,8 @@ public final class AnnotationDraftStamp { private final Optional actions; + private final Optional richText; + private final Optional box; private final Optional rotation; @@ -129,6 +131,7 @@ private AnnotationDraftStamp( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional box, Optional rotation, Optional name, @@ -166,6 +169,7 @@ private AnnotationDraftStamp( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.box = box; this.rotation = rotation; this.name = name; @@ -344,6 +348,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("box") public Optional getBox() { return box; @@ -408,6 +420,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("rotation") private Optional _getRotation() { @@ -469,6 +487,7 @@ private boolean equalTo(AnnotationDraftStamp other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && box.equals(other.box) && rotation.equals(other.rotation) && name.equals(other.name) @@ -510,6 +529,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.box, this.rotation, this.name, @@ -590,6 +610,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional box = Optional.empty(); private Optional rotation = Optional.empty(); @@ -637,6 +659,7 @@ public Builder from(AnnotationDraftStamp other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); box(other.getBox()); rotation(other.getRotation()); name(other.getName()); @@ -1041,6 +1064,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "box", nulls = Nulls.SKIP) public Builder box(Optional box) { this.box = box; @@ -1162,6 +1207,7 @@ public AnnotationDraftStamp build() { modifiedBy, importedBy, actions, + richText, box, rotation, name, diff --git a/src/main/java/api/types/AnnotationDraftStrikeout.java b/src/main/java/api/types/AnnotationDraftStrikeout.java index ccae1f7..9c21ca7 100644 --- a/src/main/java/api/types/AnnotationDraftStrikeout.java +++ b/src/main/java/api/types/AnnotationDraftStrikeout.java @@ -87,6 +87,8 @@ public final class AnnotationDraftStrikeout { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -129,6 +131,7 @@ private AnnotationDraftStrikeout( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, List quadPoints, @@ -165,6 +168,7 @@ private AnnotationDraftStrikeout( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -342,6 +346,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -395,6 +407,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("intent") private Optional _getIntent() { @@ -444,6 +462,7 @@ private boolean equalTo(AnnotationDraftStrikeout other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && quadPoints.equals(other.quadPoints) @@ -484,6 +503,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints, @@ -563,6 +583,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -608,6 +630,7 @@ public Builder from(AnnotationDraftStrikeout other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -1011,6 +1034,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1109,6 +1154,7 @@ public AnnotationDraftStrikeout build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationDraftText.java b/src/main/java/api/types/AnnotationDraftText.java index 3365170..f5a2c4c 100644 --- a/src/main/java/api/types/AnnotationDraftText.java +++ b/src/main/java/api/types/AnnotationDraftText.java @@ -86,6 +86,8 @@ public final class AnnotationDraftText { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -132,6 +134,7 @@ private AnnotationDraftText( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional icon, @@ -170,6 +173,7 @@ private AnnotationDraftText( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.icon = icon; @@ -349,6 +353,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -415,6 +427,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("state") private Optional _getState() { @@ -470,6 +488,7 @@ private boolean equalTo(AnnotationDraftText other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && icon.equals(other.icon) @@ -512,6 +531,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.icon, @@ -672,6 +692,12 @@ public interface _FinalStage { _FinalStage actions(Object actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocumentInput richText); + + _FinalStage richText(Nullable richText); + _FinalStage color(Optional color); _FinalStage color(String color); @@ -717,6 +743,8 @@ public static final class Builder implements RectStage, _FinalStage { private Optional color = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -815,6 +843,7 @@ public Builder from(AnnotationDraftText other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); icon(other.getIcon()); @@ -933,6 +962,31 @@ public _FinalStage color(Optional color) { return this; } + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Object actions) { this.actions = Optional.ofNullable(actions); @@ -1417,6 +1471,7 @@ public AnnotationDraftText build() { modifiedBy, importedBy, actions, + richText, color, opacity, icon, diff --git a/src/main/java/api/types/AnnotationDraftUnderline.java b/src/main/java/api/types/AnnotationDraftUnderline.java index 99364a7..4a534a9 100644 --- a/src/main/java/api/types/AnnotationDraftUnderline.java +++ b/src/main/java/api/types/AnnotationDraftUnderline.java @@ -87,6 +87,8 @@ public final class AnnotationDraftUnderline { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -127,6 +129,7 @@ private AnnotationDraftUnderline( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, List quadPoints, @@ -162,6 +165,7 @@ private AnnotationDraftUnderline( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -338,6 +342,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -383,6 +395,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -426,6 +444,7 @@ private boolean equalTo(AnnotationDraftUnderline other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && quadPoints.equals(other.quadPoints); @@ -465,6 +484,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints); @@ -543,6 +563,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -586,6 +608,7 @@ public Builder from(AnnotationDraftUnderline other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -988,6 +1011,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1064,6 +1109,7 @@ public AnnotationDraftUnderline build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationFileAttachment.java b/src/main/java/api/types/AnnotationFileAttachment.java index c196db4..d6e433c 100644 --- a/src/main/java/api/types/AnnotationFileAttachment.java +++ b/src/main/java/api/types/AnnotationFileAttachment.java @@ -88,6 +88,8 @@ public final class AnnotationFileAttachment { private final Optional actions; + private final Optional richText; + private final String color; private final double opacity; @@ -130,6 +132,7 @@ private AnnotationFileAttachment( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, String color, double opacity, AnnotationFileAttachmentIcon icon, @@ -166,6 +169,7 @@ private AnnotationFileAttachment( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.icon = icon; @@ -376,6 +380,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public String getColor() { return color; @@ -495,6 +507,12 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("file") private Optional _getFile() { @@ -544,6 +562,7 @@ private boolean equalTo(AnnotationFileAttachment other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && icon.equals(other.icon) @@ -584,6 +603,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.icon, @@ -776,6 +796,12 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + _FinalStage file(Optional file); _FinalStage file(AttachmentFileInfo file); @@ -842,6 +868,8 @@ public static final class Builder private Optional file = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -912,6 +940,7 @@ public Builder from(AnnotationFileAttachment other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); icon(other.getIcon()); @@ -1070,6 +1099,31 @@ public _FinalStage file(Optional file) { return this; } + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1504,6 +1558,7 @@ public AnnotationFileAttachment build() { modifiedBy, importedBy, actions, + richText, color, opacity, icon, diff --git a/src/main/java/api/types/AnnotationFreeText.java b/src/main/java/api/types/AnnotationFreeText.java index de16439..0c2272f 100644 --- a/src/main/java/api/types/AnnotationFreeText.java +++ b/src/main/java/api/types/AnnotationFreeText.java @@ -88,6 +88,8 @@ public final class AnnotationFreeText { private final Optional actions; + private final RichTextDocument richText; + private final AnnotationFreeTextBox box; private final Optional rotation; @@ -102,8 +104,6 @@ public final class AnnotationFreeText { private final AnnotationFreeTextVerticalAlign verticalAlign; - private final AnnotationFreeTextRichText richText; - private final String color; private final String fontColor; @@ -158,6 +158,7 @@ private AnnotationFreeText( Optional modifiedBy, Optional importedBy, Optional actions, + RichTextDocument richText, AnnotationFreeTextBox box, Optional rotation, AnnotationFreeTextIntent intent, @@ -165,7 +166,6 @@ private AnnotationFreeText( double fontSize, AnnotationFreeTextTextAlign textAlign, AnnotationFreeTextVerticalAlign verticalAlign, - AnnotationFreeTextRichText richText, String color, String fontColor, Optional interiorColor, @@ -208,6 +208,7 @@ private AnnotationFreeText( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.box = box; this.rotation = rotation; this.intent = intent; @@ -215,7 +216,6 @@ private AnnotationFreeText( this.fontSize = fontSize; this.textAlign = textAlign; this.verticalAlign = verticalAlign; - this.richText = richText; this.color = color; this.fontColor = fontColor; this.interiorColor = interiorColor; @@ -432,6 +432,11 @@ public Optional getActions() { return actions; } + @JsonProperty("richText") + public RichTextDocument getRichText() { + return richText; + } + @JsonProperty("box") public AnnotationFreeTextBox getBox() { return box; @@ -470,11 +475,6 @@ public AnnotationFreeTextVerticalAlign getVerticalAlign() { return verticalAlign; } - @JsonProperty("richText") - public AnnotationFreeTextRichText getRichText() { - return richText; - } - @JsonProperty("color") public String getColor() { return color; @@ -715,6 +715,7 @@ private boolean equalTo(AnnotationFreeText other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && box.equals(other.box) && rotation.equals(other.rotation) && intent.equals(other.intent) @@ -722,7 +723,6 @@ private boolean equalTo(AnnotationFreeText other) { && fontSize == other.fontSize && textAlign.equals(other.textAlign) && verticalAlign.equals(other.verticalAlign) - && richText.equals(other.richText) && color.equals(other.color) && fontColor.equals(other.fontColor) && interiorColor.equals(other.interiorColor) @@ -769,6 +769,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.box, this.rotation, this.intent, @@ -776,7 +777,6 @@ public int hashCode() { this.fontSize, this.textAlign, this.verticalAlign, - this.richText, this.color, this.fontColor, this.interiorColor, @@ -857,7 +857,11 @@ public interface ToggleNoViewStage { } public interface LockedContentsStage { - BoxStage lockedContents(boolean lockedContents); + RichTextStage lockedContents(boolean lockedContents); + } + + public interface RichTextStage { + BoxStage richText(@NotNull RichTextDocument richText); } public interface BoxStage { @@ -881,11 +885,7 @@ public interface TextAlignStage { } public interface VerticalAlignStage { - RichTextStage verticalAlign(@NotNull AnnotationFreeTextVerticalAlign verticalAlign); - } - - public interface RichTextStage { - ColorStage richText(@NotNull AnnotationFreeTextRichText richText); + ColorStage verticalAlign(@NotNull AnnotationFreeTextVerticalAlign verticalAlign); } public interface ColorStage { @@ -1065,13 +1065,13 @@ public static final class Builder LockedStage, ToggleNoViewStage, LockedContentsStage, + RichTextStage, BoxStage, IntentStage, FontFamilyStage, FontSizeStage, TextAlignStage, VerticalAlignStage, - RichTextStage, ColorStage, FontColorStage, OpacityStage, @@ -1108,6 +1108,8 @@ public static final class Builder private boolean lockedContents; + private RichTextDocument richText; + private AnnotationFreeTextBox box; private AnnotationFreeTextIntent intent; @@ -1120,8 +1122,6 @@ public static final class Builder private AnnotationFreeTextVerticalAlign verticalAlign; - private AnnotationFreeTextRichText richText; - private String color; private String fontColor; @@ -1214,6 +1214,7 @@ public Builder from(AnnotationFreeText other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); box(other.getBox()); rotation(other.getRotation()); intent(other.getIntent()); @@ -1221,7 +1222,6 @@ public Builder from(AnnotationFreeText other) { fontSize(other.getFontSize()); textAlign(other.getTextAlign()); verticalAlign(other.getVerticalAlign()); - richText(other.getRichText()); color(other.getColor()); fontColor(other.getFontColor()); interiorColor(other.getInteriorColor()); @@ -1335,11 +1335,18 @@ public LockedContentsStage toggleNoView(boolean toggleNoView) { @java.lang.Override @JsonSetter("lockedContents") - public BoxStage lockedContents(boolean lockedContents) { + public RichTextStage lockedContents(boolean lockedContents) { this.lockedContents = lockedContents; return this; } + @java.lang.Override + @JsonSetter("richText") + public BoxStage richText(@NotNull RichTextDocument richText) { + this.richText = Objects.requireNonNull(richText, "richText must not be null"); + return this; + } + @java.lang.Override @JsonSetter("box") public IntentStage box(@NotNull AnnotationFreeTextBox box) { @@ -1377,18 +1384,11 @@ public VerticalAlignStage textAlign(@NotNull AnnotationFreeTextTextAlign textAli @java.lang.Override @JsonSetter("verticalAlign") - public RichTextStage verticalAlign(@NotNull AnnotationFreeTextVerticalAlign verticalAlign) { + public ColorStage verticalAlign(@NotNull AnnotationFreeTextVerticalAlign verticalAlign) { this.verticalAlign = Objects.requireNonNull(verticalAlign, "verticalAlign must not be null"); return this; } - @java.lang.Override - @JsonSetter("richText") - public ColorStage richText(@NotNull AnnotationFreeTextRichText richText) { - this.richText = Objects.requireNonNull(richText, "richText must not be null"); - return this; - } - @java.lang.Override @JsonSetter("color") public FontColorStage color(@NotNull String color) { @@ -2008,6 +2008,7 @@ public AnnotationFreeText build() { modifiedBy, importedBy, actions, + richText, box, rotation, intent, @@ -2015,7 +2016,6 @@ public AnnotationFreeText build() { fontSize, textAlign, verticalAlign, - richText, color, fontColor, interiorColor, diff --git a/src/main/java/api/types/AnnotationHighlight.java b/src/main/java/api/types/AnnotationHighlight.java index 7b50843..7353659 100644 --- a/src/main/java/api/types/AnnotationHighlight.java +++ b/src/main/java/api/types/AnnotationHighlight.java @@ -89,6 +89,8 @@ public final class AnnotationHighlight { private final Optional actions; + private final Optional richText; + private final String color; private final double opacity; @@ -129,6 +131,7 @@ private AnnotationHighlight( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, String color, double opacity, List quadPoints, @@ -164,6 +167,7 @@ private AnnotationHighlight( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -373,6 +377,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public String getColor() { return color; @@ -484,6 +496,12 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -527,6 +545,7 @@ private boolean equalTo(AnnotationHighlight other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && quadPoints.equals(other.quadPoints); @@ -566,6 +585,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints); @@ -753,6 +773,12 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + _FinalStage quadPoints(List quadPoints); _FinalStage addQuadPoints(AnnotationHighlightQuadPointsItem quadPoints); @@ -816,6 +842,8 @@ public static final class Builder private List quadPoints = new ArrayList<>(); + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -886,6 +914,7 @@ public Builder from(AnnotationHighlight other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -1035,6 +1064,31 @@ public _FinalStage quadPoints(List quadPoints return this; } + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1469,6 +1523,7 @@ public AnnotationHighlight build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationInk.java b/src/main/java/api/types/AnnotationInk.java index 9f04e05..c0e513c 100644 --- a/src/main/java/api/types/AnnotationInk.java +++ b/src/main/java/api/types/AnnotationInk.java @@ -89,7 +89,9 @@ public final class AnnotationInk { private final Optional actions; - private final String color; + private final Optional richText; + + private final Optional color; private final double opacity; @@ -139,7 +141,8 @@ private AnnotationInk( Optional modifiedBy, Optional importedBy, Optional actions, - String color, + Optional richText, + Optional color, double opacity, double strokeWidth, AnnotationInkBorderStyle borderStyle, @@ -179,6 +182,7 @@ private AnnotationInk( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -393,8 +397,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") - public String getColor() { + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore + public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -538,6 +553,18 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -599,6 +626,7 @@ private boolean equalTo(AnnotationInk other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && strokeWidth == other.strokeWidth @@ -643,6 +671,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -721,11 +750,7 @@ public interface ToggleNoViewStage { } public interface LockedContentsStage { - ColorStage lockedContents(boolean lockedContents); - } - - public interface ColorStage { - OpacityStage color(@NotNull String color); + OpacityStage lockedContents(boolean lockedContents); } public interface OpacityStage { @@ -843,6 +868,18 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + + _FinalStage color(Optional color); + + _FinalStage color(String color); + + _FinalStage color(Nullable color); + _FinalStage dashArray(Optional> dashArray); _FinalStage dashArray(List dashArray); @@ -885,7 +922,6 @@ public static final class Builder LockedStage, ToggleNoViewStage, LockedContentsStage, - ColorStage, OpacityStage, StrokeWidthStage, BorderStyleStage, @@ -920,8 +956,6 @@ public static final class Builder private boolean lockedContents; - private String color; - private double opacity; private double strokeWidth; @@ -936,6 +970,10 @@ public static final class Builder private Optional> dashArray = Optional.empty(); + private Optional color = Optional.empty(); + + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -1006,6 +1044,7 @@ public Builder from(AnnotationInk other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1117,18 +1156,11 @@ public LockedContentsStage toggleNoView(boolean toggleNoView) { @java.lang.Override @JsonSetter("lockedContents") - public ColorStage lockedContents(boolean lockedContents) { + public OpacityStage lockedContents(boolean lockedContents) { this.lockedContents = lockedContents; return this; } - @java.lang.Override - @JsonSetter("color") - public OpacityStage color(@NotNull String color) { - this.color = Objects.requireNonNull(color, "color must not be null"); - return this; - } - @java.lang.Override @JsonSetter("opacity") public StrokeWidthStage opacity(double opacity) { @@ -1249,6 +1281,56 @@ public _FinalStage dashArray(Optional> dashArray) { return this; } + @java.lang.Override + public _FinalStage color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage color(String color) { + this.color = Optional.ofNullable(color); + return this; + } + + @java.lang.Override + @JsonSetter(value = "color", nulls = Nulls.SKIP) + public _FinalStage color(Optional color) { + this.color = color; + return this; + } + + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1683,6 +1765,7 @@ public AnnotationInk build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationLine.java b/src/main/java/api/types/AnnotationLine.java index a5430aa..62ba105 100644 --- a/src/main/java/api/types/AnnotationLine.java +++ b/src/main/java/api/types/AnnotationLine.java @@ -88,7 +88,9 @@ public final class AnnotationLine { private final Optional actions; - private final String color; + private final Optional richText; + + private final Optional color; private final double opacity; @@ -152,7 +154,8 @@ private AnnotationLine( Optional modifiedBy, Optional importedBy, Optional actions, - String color, + Optional richText, + Optional color, double opacity, double strokeWidth, AnnotationLineBorderStyle borderStyle, @@ -199,6 +202,7 @@ private AnnotationLine( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -420,8 +424,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") - public String getColor() { + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore + public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -615,6 +630,18 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -706,6 +733,7 @@ private boolean equalTo(AnnotationLine other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && strokeWidth == other.strokeWidth @@ -757,6 +785,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -842,11 +871,7 @@ public interface ToggleNoViewStage { } public interface LockedContentsStage { - ColorStage lockedContents(boolean lockedContents); - } - - public interface ColorStage { - OpacityStage color(@NotNull String color); + OpacityStage lockedContents(boolean lockedContents); } public interface OpacityStage { @@ -976,6 +1001,18 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + + _FinalStage color(Optional color); + + _FinalStage color(String color); + + _FinalStage color(Nullable color); + _FinalStage dashArray(Optional> dashArray); _FinalStage dashArray(List dashArray); @@ -1042,7 +1079,6 @@ public static final class Builder LockedStage, ToggleNoViewStage, LockedContentsStage, - ColorStage, OpacityStage, StrokeWidthStage, BorderStyleStage, @@ -1080,8 +1116,6 @@ public static final class Builder private boolean lockedContents; - private String color; - private double opacity; private double strokeWidth; @@ -1110,6 +1144,10 @@ public static final class Builder private Optional> dashArray = Optional.empty(); + private Optional color = Optional.empty(); + + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -1180,6 +1218,7 @@ public Builder from(AnnotationLine other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1298,18 +1337,11 @@ public LockedContentsStage toggleNoView(boolean toggleNoView) { @java.lang.Override @JsonSetter("lockedContents") - public ColorStage lockedContents(boolean lockedContents) { + public OpacityStage lockedContents(boolean lockedContents) { this.lockedContents = lockedContents; return this; } - @java.lang.Override - @JsonSetter("color") - public OpacityStage color(@NotNull String color) { - this.color = Objects.requireNonNull(color, "color must not be null"); - return this; - } - @java.lang.Override @JsonSetter("opacity") public StrokeWidthStage opacity(double opacity) { @@ -1552,6 +1584,56 @@ public _FinalStage dashArray(Optional> dashArray) { return this; } + @java.lang.Override + public _FinalStage color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage color(String color) { + this.color = Optional.ofNullable(color); + return this; + } + + @java.lang.Override + @JsonSetter(value = "color", nulls = Nulls.SKIP) + public _FinalStage color(Optional color) { + this.color = color; + return this; + } + + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1986,6 +2068,7 @@ public AnnotationLine build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationPatchCaret.java b/src/main/java/api/types/AnnotationPatchCaret.java index 8e9f987..21f5ffc 100644 --- a/src/main/java/api/types/AnnotationPatchCaret.java +++ b/src/main/java/api/types/AnnotationPatchCaret.java @@ -85,6 +85,8 @@ public final class AnnotationPatchCaret { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -129,6 +131,7 @@ private AnnotationPatchCaret( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional box, @@ -166,6 +169,7 @@ private AnnotationPatchCaret( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.box = box; @@ -344,6 +348,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -405,6 +417,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("rotation") private Optional _getRotation() { @@ -460,6 +478,7 @@ private boolean equalTo(AnnotationPatchCaret other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && box.equals(other.box) @@ -501,6 +520,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.box, @@ -581,6 +601,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -628,6 +650,7 @@ public Builder from(AnnotationPatchCaret other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); box(other.getBox()); @@ -1032,6 +1055,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1142,6 +1187,7 @@ public AnnotationPatchCaret build() { modifiedBy, importedBy, actions, + richText, color, opacity, box, diff --git a/src/main/java/api/types/AnnotationPatchCircle.java b/src/main/java/api/types/AnnotationPatchCircle.java index 058c7c1..e8254d2 100644 --- a/src/main/java/api/types/AnnotationPatchCircle.java +++ b/src/main/java/api/types/AnnotationPatchCircle.java @@ -86,6 +86,8 @@ public final class AnnotationPatchCircle { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -138,6 +140,7 @@ private AnnotationPatchCircle( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional strokeWidth, @@ -179,6 +182,7 @@ private AnnotationPatchCircle( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -361,8 +365,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -448,6 +463,18 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -515,6 +542,7 @@ private boolean equalTo(AnnotationPatchCircle other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && strokeWidth.equals(other.strokeWidth) @@ -560,6 +588,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -644,6 +673,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -699,6 +730,7 @@ public Builder from(AnnotationPatchCircle other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1107,6 +1139,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1118,6 +1172,17 @@ public Builder color(String color) { return this; } + public Builder color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + @JsonSetter(value = "opacity", nulls = Nulls.SKIP) public Builder opacity(Optional opacity) { this.opacity = opacity; @@ -1283,6 +1348,7 @@ public AnnotationPatchCircle build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationPatchFileAttachment.java b/src/main/java/api/types/AnnotationPatchFileAttachment.java index 4c721a5..c5bb37f 100644 --- a/src/main/java/api/types/AnnotationPatchFileAttachment.java +++ b/src/main/java/api/types/AnnotationPatchFileAttachment.java @@ -85,6 +85,8 @@ public final class AnnotationPatchFileAttachment { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -127,6 +129,7 @@ private AnnotationPatchFileAttachment( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional icon, @@ -163,6 +166,7 @@ private AnnotationPatchFileAttachment( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.icon = icon; @@ -340,6 +344,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -393,6 +405,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("file") private Optional _getFile() { @@ -442,6 +460,7 @@ private boolean equalTo(AnnotationPatchFileAttachment other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && icon.equals(other.icon) @@ -482,6 +501,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.icon, @@ -561,6 +581,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -606,6 +628,7 @@ public Builder from(AnnotationPatchFileAttachment other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); icon(other.getIcon()); @@ -1009,6 +1032,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1097,6 +1142,7 @@ public AnnotationPatchFileAttachment build() { modifiedBy, importedBy, actions, + richText, color, opacity, icon, diff --git a/src/main/java/api/types/AnnotationPatchFreeText.java b/src/main/java/api/types/AnnotationPatchFreeText.java index 88275ee..979a87d 100644 --- a/src/main/java/api/types/AnnotationPatchFreeText.java +++ b/src/main/java/api/types/AnnotationPatchFreeText.java @@ -86,6 +86,8 @@ public final class AnnotationPatchFreeText { private final Optional actions; + private final Optional richText; + private final Optional box; private final Optional rotation; @@ -100,8 +102,6 @@ public final class AnnotationPatchFreeText { private final Optional verticalAlign; - private final Optional richText; - private final Optional color; private final Optional fontColor; @@ -156,6 +156,7 @@ private AnnotationPatchFreeText( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional box, Optional rotation, Optional intent, @@ -163,7 +164,6 @@ private AnnotationPatchFreeText( Optional fontSize, Optional textAlign, Optional verticalAlign, - Optional richText, Optional color, Optional fontColor, Optional interiorColor, @@ -206,6 +206,7 @@ private AnnotationPatchFreeText( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.box = box; this.rotation = rotation; this.intent = intent; @@ -213,7 +214,6 @@ private AnnotationPatchFreeText( this.fontSize = fontSize; this.textAlign = textAlign; this.verticalAlign = verticalAlign; - this.richText = richText; this.color = color; this.fontColor = fontColor; this.interiorColor = interiorColor; @@ -397,6 +397,11 @@ public Optional getActions() { return actions; } + @JsonProperty("richText") + public Optional getRichText() { + return richText; + } + @JsonProperty("box") public Optional getBox() { return box; @@ -435,11 +440,6 @@ public Optional getVerticalAlign() { return verticalAlign; } - @JsonProperty("richText") - public Optional getRichText() { - return richText; - } - @JsonProperty("color") public Optional getColor() { return color; @@ -614,6 +614,7 @@ private boolean equalTo(AnnotationPatchFreeText other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && box.equals(other.box) && rotation.equals(other.rotation) && intent.equals(other.intent) @@ -621,7 +622,6 @@ private boolean equalTo(AnnotationPatchFreeText other) { && fontSize.equals(other.fontSize) && textAlign.equals(other.textAlign) && verticalAlign.equals(other.verticalAlign) - && richText.equals(other.richText) && color.equals(other.color) && fontColor.equals(other.fontColor) && interiorColor.equals(other.interiorColor) @@ -668,6 +668,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.box, this.rotation, this.intent, @@ -675,7 +676,6 @@ public int hashCode() { this.fontSize, this.textAlign, this.verticalAlign, - this.richText, this.color, this.fontColor, this.interiorColor, @@ -761,6 +761,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional box = Optional.empty(); private Optional rotation = Optional.empty(); @@ -775,8 +777,6 @@ public static final class Builder { private Optional verticalAlign = Optional.empty(); - private Optional richText = Optional.empty(); - private Optional color = Optional.empty(); private Optional fontColor = Optional.empty(); @@ -834,6 +834,7 @@ public Builder from(AnnotationPatchFreeText other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); box(other.getBox()); rotation(other.getRotation()); intent(other.getIntent()); @@ -841,7 +842,6 @@ public Builder from(AnnotationPatchFreeText other) { fontSize(other.getFontSize()); textAlign(other.getTextAlign()); verticalAlign(other.getVerticalAlign()); - richText(other.getRichText()); color(other.getColor()); fontColor(other.getFontColor()); interiorColor(other.getInteriorColor()); @@ -1251,6 +1251,17 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + @JsonSetter(value = "box", nulls = Nulls.SKIP) public Builder box(Optional box) { this.box = box; @@ -1339,17 +1350,6 @@ public Builder verticalAlign(AnnotationPatchFreeTextVerticalAlign verticalAlign) return this; } - @JsonSetter(value = "richText", nulls = Nulls.SKIP) - public Builder richText(Optional richText) { - this.richText = richText; - return this; - } - - public Builder richText(AnnotationPatchFreeTextRichText richText) { - this.richText = Optional.ofNullable(richText); - return this; - } - @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1548,6 +1548,7 @@ public AnnotationPatchFreeText build() { modifiedBy, importedBy, actions, + richText, box, rotation, intent, @@ -1555,7 +1556,6 @@ public AnnotationPatchFreeText build() { fontSize, textAlign, verticalAlign, - richText, color, fontColor, interiorColor, diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichText.java b/src/main/java/api/types/AnnotationPatchFreeTextRichText.java deleted file mode 100644 index fb2d39d..0000000 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichText.java +++ /dev/null @@ -1,142 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.cloudpdf.api.core.ObjectMappers; -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 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 = AnnotationPatchFreeTextRichText.Builder.class) -public final class AnnotationPatchFreeTextRichText { - private final Optional body; - - private final List paragraphs; - - private final Map additionalProperties; - - private AnnotationPatchFreeTextRichText( - Optional body, - List paragraphs, - Map additionalProperties) { - this.body = body; - this.paragraphs = paragraphs; - this.additionalProperties = additionalProperties; - } - - @JsonProperty("body") - public Optional getBody() { - return body; - } - - @JsonProperty("paragraphs") - public List getParagraphs() { - return paragraphs; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof AnnotationPatchFreeTextRichText && equalTo((AnnotationPatchFreeTextRichText) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(AnnotationPatchFreeTextRichText other) { - return body.equals(other.body) && paragraphs.equals(other.paragraphs); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.body, this.paragraphs); - } - - @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 body = Optional.empty(); - - private List paragraphs = new ArrayList<>(); - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - public Builder from(AnnotationPatchFreeTextRichText other) { - body(other.getBody()); - paragraphs(other.getParagraphs()); - return this; - } - - @JsonSetter(value = "body", nulls = Nulls.SKIP) - public Builder body(Optional body) { - this.body = body; - return this; - } - - public Builder body(AnnotationPatchFreeTextRichTextBody body) { - this.body = Optional.ofNullable(body); - return this; - } - - @JsonSetter(value = "paragraphs", nulls = Nulls.SKIP) - public Builder paragraphs(List paragraphs) { - this.paragraphs.clear(); - if (paragraphs != null) { - this.paragraphs.addAll(paragraphs); - } - return this; - } - - public Builder addParagraphs(AnnotationPatchFreeTextRichTextParagraphsItem paragraphs) { - this.paragraphs.add(paragraphs); - return this; - } - - public Builder addAllParagraphs(List paragraphs) { - if (paragraphs != null) { - this.paragraphs.addAll(paragraphs); - } - return this; - } - - public AnnotationPatchFreeTextRichText build() { - return new AnnotationPatchFreeTextRichText(body, paragraphs, additionalProperties); - } - - public Builder additionalProperty(String key, Object value) { - this.additionalProperties.put(key, value); - return this; - } - - public Builder additionalProperties(Map additionalProperties) { - this.additionalProperties.putAll(additionalProperties); - return this; - } - } -} diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextBody.java b/src/main/java/api/types/AnnotationPatchFreeTextRichTextBody.java deleted file mode 100644 index 0f57efa..0000000 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextBody.java +++ /dev/null @@ -1,476 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.cloudpdf.api.core.ObjectMappers; -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 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 = AnnotationPatchFreeTextRichTextBody.Builder.class) -public final class AnnotationPatchFreeTextRichTextBody { - private final Optional family; - - private final Optional weight; - - private final Optional italic; - - private final Optional size; - - private final Optional color; - - private final Optional> decoration; - - private final Optional script; - - private final Optional letterSpacing; - - private final Optional horizontalScale; - - private final Optional unknown; - - private final Optional align; - - private final Optional dir; - - private final Optional lineHeight; - - private final Optional margins; - - private final Optional textIndent; - - private final Map additionalProperties; - - private AnnotationPatchFreeTextRichTextBody( - Optional family, - Optional weight, - Optional italic, - Optional size, - Optional color, - Optional> decoration, - Optional script, - Optional letterSpacing, - Optional horizontalScale, - Optional unknown, - Optional align, - Optional dir, - Optional lineHeight, - Optional margins, - Optional textIndent, - Map additionalProperties) { - this.family = family; - this.weight = weight; - this.italic = italic; - this.size = size; - this.color = color; - this.decoration = decoration; - this.script = script; - this.letterSpacing = letterSpacing; - this.horizontalScale = horizontalScale; - this.unknown = unknown; - this.align = align; - this.dir = dir; - this.lineHeight = lineHeight; - this.margins = margins; - this.textIndent = textIndent; - this.additionalProperties = additionalProperties; - } - - @JsonProperty("family") - public Optional getFamily() { - return family; - } - - @JsonProperty("weight") - public Optional getWeight() { - return weight; - } - - @JsonProperty("italic") - public Optional getItalic() { - return italic; - } - - @JsonProperty("size") - public Optional getSize() { - return size; - } - - @JsonProperty("color") - public Optional getColor() { - return color; - } - - @JsonProperty("decoration") - public Optional> getDecoration() { - return decoration; - } - - @JsonProperty("script") - public Optional getScript() { - return script; - } - - @JsonProperty("letterSpacing") - public Optional getLetterSpacing() { - return letterSpacing; - } - - @JsonProperty("horizontalScale") - public Optional getHorizontalScale() { - return horizontalScale; - } - - @JsonProperty("unknown") - public Optional getUnknown() { - return unknown; - } - - @JsonProperty("align") - public Optional getAlign() { - return align; - } - - @JsonProperty("dir") - public Optional getDir() { - return dir; - } - - @JsonProperty("lineHeight") - public Optional getLineHeight() { - return lineHeight; - } - - @JsonProperty("margins") - public Optional getMargins() { - return margins; - } - - @JsonProperty("textIndent") - public Optional getTextIndent() { - return textIndent; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof AnnotationPatchFreeTextRichTextBody - && equalTo((AnnotationPatchFreeTextRichTextBody) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(AnnotationPatchFreeTextRichTextBody other) { - return family.equals(other.family) - && weight.equals(other.weight) - && italic.equals(other.italic) - && size.equals(other.size) - && color.equals(other.color) - && decoration.equals(other.decoration) - && script.equals(other.script) - && letterSpacing.equals(other.letterSpacing) - && horizontalScale.equals(other.horizontalScale) - && unknown.equals(other.unknown) - && align.equals(other.align) - && dir.equals(other.dir) - && lineHeight.equals(other.lineHeight) - && margins.equals(other.margins) - && textIndent.equals(other.textIndent); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash( - this.family, - this.weight, - this.italic, - this.size, - this.color, - this.decoration, - this.script, - this.letterSpacing, - this.horizontalScale, - this.unknown, - this.align, - this.dir, - this.lineHeight, - this.margins, - this.textIndent); - } - - @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 family = Optional.empty(); - - private Optional weight = Optional.empty(); - - private Optional italic = Optional.empty(); - - private Optional size = Optional.empty(); - - private Optional color = Optional.empty(); - - private Optional> decoration = Optional.empty(); - - private Optional script = Optional.empty(); - - private Optional letterSpacing = Optional.empty(); - - private Optional horizontalScale = Optional.empty(); - - private Optional unknown = Optional.empty(); - - private Optional align = Optional.empty(); - - private Optional dir = Optional.empty(); - - private Optional lineHeight = Optional.empty(); - - private Optional margins = Optional.empty(); - - private Optional textIndent = Optional.empty(); - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - public Builder from(AnnotationPatchFreeTextRichTextBody other) { - family(other.getFamily()); - weight(other.getWeight()); - italic(other.getItalic()); - size(other.getSize()); - color(other.getColor()); - decoration(other.getDecoration()); - script(other.getScript()); - letterSpacing(other.getLetterSpacing()); - horizontalScale(other.getHorizontalScale()); - unknown(other.getUnknown()); - align(other.getAlign()); - dir(other.getDir()); - lineHeight(other.getLineHeight()); - margins(other.getMargins()); - textIndent(other.getTextIndent()); - return this; - } - - @JsonSetter(value = "family", nulls = Nulls.SKIP) - public Builder family(Optional family) { - this.family = family; - return this; - } - - public Builder family(String family) { - this.family = Optional.ofNullable(family); - return this; - } - - @JsonSetter(value = "weight", nulls = Nulls.SKIP) - public Builder weight(Optional weight) { - this.weight = weight; - return this; - } - - public Builder weight(Integer weight) { - this.weight = Optional.ofNullable(weight); - return this; - } - - @JsonSetter(value = "italic", nulls = Nulls.SKIP) - public Builder italic(Optional italic) { - this.italic = italic; - return this; - } - - public Builder italic(Boolean italic) { - this.italic = Optional.ofNullable(italic); - return this; - } - - @JsonSetter(value = "size", nulls = Nulls.SKIP) - public Builder size(Optional size) { - this.size = size; - return this; - } - - public Builder size(Double size) { - this.size = Optional.ofNullable(size); - return this; - } - - @JsonSetter(value = "color", nulls = Nulls.SKIP) - public Builder color(Optional color) { - this.color = color; - return this; - } - - public Builder color(String color) { - this.color = Optional.ofNullable(color); - return this; - } - - @JsonSetter(value = "decoration", nulls = Nulls.SKIP) - public Builder decoration(Optional> decoration) { - this.decoration = decoration; - return this; - } - - public Builder decoration(List decoration) { - this.decoration = Optional.ofNullable(decoration); - return this; - } - - @JsonSetter(value = "script", nulls = Nulls.SKIP) - public Builder script(Optional script) { - this.script = script; - return this; - } - - public Builder script(AnnotationPatchFreeTextRichTextBodyScript script) { - this.script = Optional.ofNullable(script); - return this; - } - - @JsonSetter(value = "letterSpacing", nulls = Nulls.SKIP) - public Builder letterSpacing(Optional letterSpacing) { - this.letterSpacing = letterSpacing; - return this; - } - - public Builder letterSpacing(Double letterSpacing) { - this.letterSpacing = Optional.ofNullable(letterSpacing); - return this; - } - - @JsonSetter(value = "horizontalScale", nulls = Nulls.SKIP) - public Builder horizontalScale(Optional horizontalScale) { - this.horizontalScale = horizontalScale; - return this; - } - - public Builder horizontalScale(Double horizontalScale) { - this.horizontalScale = Optional.ofNullable(horizontalScale); - return this; - } - - @JsonSetter(value = "unknown", nulls = Nulls.SKIP) - public Builder unknown(Optional unknown) { - this.unknown = unknown; - return this; - } - - public Builder unknown(String unknown) { - this.unknown = Optional.ofNullable(unknown); - return this; - } - - @JsonSetter(value = "align", nulls = Nulls.SKIP) - public Builder align(Optional align) { - this.align = align; - return this; - } - - public Builder align(AnnotationPatchFreeTextRichTextBodyAlign align) { - this.align = Optional.ofNullable(align); - return this; - } - - @JsonSetter(value = "dir", nulls = Nulls.SKIP) - public Builder dir(Optional dir) { - this.dir = dir; - return this; - } - - public Builder dir(AnnotationPatchFreeTextRichTextBodyDir dir) { - this.dir = Optional.ofNullable(dir); - return this; - } - - @JsonSetter(value = "lineHeight", nulls = Nulls.SKIP) - public Builder lineHeight(Optional lineHeight) { - this.lineHeight = lineHeight; - return this; - } - - public Builder lineHeight(Double lineHeight) { - this.lineHeight = Optional.ofNullable(lineHeight); - return this; - } - - @JsonSetter(value = "margins", nulls = Nulls.SKIP) - public Builder margins(Optional margins) { - this.margins = margins; - return this; - } - - public Builder margins(AnnotationPatchFreeTextRichTextBodyMargins margins) { - this.margins = Optional.ofNullable(margins); - return this; - } - - @JsonSetter(value = "textIndent", nulls = Nulls.SKIP) - public Builder textIndent(Optional textIndent) { - this.textIndent = textIndent; - return this; - } - - public Builder textIndent(Double textIndent) { - this.textIndent = Optional.ofNullable(textIndent); - return this; - } - - public AnnotationPatchFreeTextRichTextBody build() { - return new AnnotationPatchFreeTextRichTextBody( - family, - weight, - italic, - size, - color, - decoration, - script, - letterSpacing, - horizontalScale, - unknown, - align, - dir, - lineHeight, - margins, - textIndent, - additionalProperties); - } - - public Builder additionalProperty(String key, Object value) { - this.additionalProperties.put(key, value); - return this; - } - - public Builder additionalProperties(Map additionalProperties) { - this.additionalProperties.putAll(additionalProperties); - return this; - } - } -} diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemAlign.java b/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemAlign.java deleted file mode 100644 index 7ee44ed..0000000 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemAlign.java +++ /dev/null @@ -1,108 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -public final class AnnotationPatchFreeTextRichTextParagraphsItemAlign { - public static final AnnotationPatchFreeTextRichTextParagraphsItemAlign JUSTIFY = - new AnnotationPatchFreeTextRichTextParagraphsItemAlign(Value.JUSTIFY, "justify"); - - public static final AnnotationPatchFreeTextRichTextParagraphsItemAlign LEFT = - new AnnotationPatchFreeTextRichTextParagraphsItemAlign(Value.LEFT, "left"); - - public static final AnnotationPatchFreeTextRichTextParagraphsItemAlign RIGHT = - new AnnotationPatchFreeTextRichTextParagraphsItemAlign(Value.RIGHT, "right"); - - public static final AnnotationPatchFreeTextRichTextParagraphsItemAlign CENTER = - new AnnotationPatchFreeTextRichTextParagraphsItemAlign(Value.CENTER, "center"); - - private final Value value; - - private final String string; - - AnnotationPatchFreeTextRichTextParagraphsItemAlign(Value value, String string) { - this.value = value; - this.string = string; - } - - public Value getEnumValue() { - return value; - } - - @java.lang.Override - @JsonValue - public String toString() { - return this.string; - } - - @java.lang.Override - public boolean equals(Object other) { - return (this == other) - || (other instanceof AnnotationPatchFreeTextRichTextParagraphsItemAlign - && this.string.equals(((AnnotationPatchFreeTextRichTextParagraphsItemAlign) other).string)); - } - - @java.lang.Override - public int hashCode() { - return this.string.hashCode(); - } - - public T visit(Visitor visitor) { - switch (value) { - case JUSTIFY: - return visitor.visitJustify(); - case LEFT: - return visitor.visitLeft(); - case RIGHT: - return visitor.visitRight(); - case CENTER: - return visitor.visitCenter(); - case UNKNOWN: - default: - return visitor.visitUnknown(string); - } - } - - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationPatchFreeTextRichTextParagraphsItemAlign valueOf(String value) { - switch (value) { - case "justify": - return JUSTIFY; - case "left": - return LEFT; - case "right": - return RIGHT; - case "center": - return CENTER; - default: - return new AnnotationPatchFreeTextRichTextParagraphsItemAlign(Value.UNKNOWN, value); - } - } - - public enum Value { - LEFT, - - CENTER, - - RIGHT, - - JUSTIFY, - - UNKNOWN - } - - public interface Visitor { - T visitLeft(); - - T visitCenter(); - - T visitRight(); - - T visitJustify(); - - T visitUnknown(String unknownType); - } -} diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemDir.java b/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemDir.java deleted file mode 100644 index 622a43c..0000000 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemDir.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -public final class AnnotationPatchFreeTextRichTextParagraphsItemDir { - public static final AnnotationPatchFreeTextRichTextParagraphsItemDir LTR = - new AnnotationPatchFreeTextRichTextParagraphsItemDir(Value.LTR, "ltr"); - - public static final AnnotationPatchFreeTextRichTextParagraphsItemDir RTL = - new AnnotationPatchFreeTextRichTextParagraphsItemDir(Value.RTL, "rtl"); - - private final Value value; - - private final String string; - - AnnotationPatchFreeTextRichTextParagraphsItemDir(Value value, String string) { - this.value = value; - this.string = string; - } - - public Value getEnumValue() { - return value; - } - - @java.lang.Override - @JsonValue - public String toString() { - return this.string; - } - - @java.lang.Override - public boolean equals(Object other) { - return (this == other) - || (other instanceof AnnotationPatchFreeTextRichTextParagraphsItemDir - && this.string.equals(((AnnotationPatchFreeTextRichTextParagraphsItemDir) other).string)); - } - - @java.lang.Override - public int hashCode() { - return this.string.hashCode(); - } - - public T visit(Visitor visitor) { - switch (value) { - case LTR: - return visitor.visitLtr(); - case RTL: - return visitor.visitRtl(); - case UNKNOWN: - default: - return visitor.visitUnknown(string); - } - } - - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationPatchFreeTextRichTextParagraphsItemDir valueOf(String value) { - switch (value) { - case "ltr": - return LTR; - case "rtl": - return RTL; - default: - return new AnnotationPatchFreeTextRichTextParagraphsItemDir(Value.UNKNOWN, value); - } - } - - public enum Value { - LTR, - - RTL, - - UNKNOWN - } - - public interface Visitor { - T visitLtr(); - - T visitRtl(); - - T visitUnknown(String unknownType); - } -} diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemMargins.java b/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemMargins.java deleted file mode 100644 index 56cfdfd..0000000 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemMargins.java +++ /dev/null @@ -1,186 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.cloudpdf.api.core.ObjectMappers; -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 java.util.HashMap; -import java.util.Map; -import java.util.Objects; - -@JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationPatchFreeTextRichTextParagraphsItemMargins.Builder.class) -public final class AnnotationPatchFreeTextRichTextParagraphsItemMargins { - private final double top; - - private final double bottom; - - private final double left; - - private final double right; - - private final Map additionalProperties; - - private AnnotationPatchFreeTextRichTextParagraphsItemMargins( - double top, double bottom, double left, double right, Map additionalProperties) { - this.top = top; - this.bottom = bottom; - this.left = left; - this.right = right; - this.additionalProperties = additionalProperties; - } - - @JsonProperty("top") - public double getTop() { - return top; - } - - @JsonProperty("bottom") - public double getBottom() { - return bottom; - } - - @JsonProperty("left") - public double getLeft() { - return left; - } - - @JsonProperty("right") - public double getRight() { - return right; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof AnnotationPatchFreeTextRichTextParagraphsItemMargins - && equalTo((AnnotationPatchFreeTextRichTextParagraphsItemMargins) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(AnnotationPatchFreeTextRichTextParagraphsItemMargins other) { - return top == other.top && bottom == other.bottom && left == other.left && right == other.right; - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.top, this.bottom, this.left, this.right); - } - - @java.lang.Override - public String toString() { - return ObjectMappers.stringify(this); - } - - public static TopStage builder() { - return new Builder(); - } - - public interface TopStage { - BottomStage top(double top); - - Builder from(AnnotationPatchFreeTextRichTextParagraphsItemMargins other); - } - - public interface BottomStage { - LeftStage bottom(double bottom); - } - - public interface LeftStage { - RightStage left(double left); - } - - public interface RightStage { - _FinalStage right(double right); - } - - public interface _FinalStage { - AnnotationPatchFreeTextRichTextParagraphsItemMargins build(); - - _FinalStage additionalProperty(String key, Object value); - - _FinalStage additionalProperties(Map additionalProperties); - } - - @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements TopStage, BottomStage, LeftStage, RightStage, _FinalStage { - private double top; - - private double bottom; - - private double left; - - private double right; - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - @java.lang.Override - public Builder from(AnnotationPatchFreeTextRichTextParagraphsItemMargins other) { - top(other.getTop()); - bottom(other.getBottom()); - left(other.getLeft()); - right(other.getRight()); - return this; - } - - @java.lang.Override - @JsonSetter("top") - public BottomStage top(double top) { - this.top = top; - return this; - } - - @java.lang.Override - @JsonSetter("bottom") - public LeftStage bottom(double bottom) { - this.bottom = bottom; - return this; - } - - @java.lang.Override - @JsonSetter("left") - public RightStage left(double left) { - this.left = left; - return this; - } - - @java.lang.Override - @JsonSetter("right") - public _FinalStage right(double right) { - this.right = right; - return this; - } - - @java.lang.Override - public AnnotationPatchFreeTextRichTextParagraphsItemMargins build() { - return new AnnotationPatchFreeTextRichTextParagraphsItemMargins( - top, bottom, left, right, additionalProperties); - } - - @java.lang.Override - public Builder additionalProperty(String key, Object value) { - this.additionalProperties.put(key, value); - return this; - } - - @java.lang.Override - public Builder additionalProperties(Map additionalProperties) { - this.additionalProperties.putAll(additionalProperties); - return this; - } - } -} diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem.java b/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem.java deleted file mode 100644 index 3b2bb32..0000000 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -public final class AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem { - public static final AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem WORD = - new AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem(Value.WORD, "word"); - - public static final AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem UNDERLINE = - new AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem(Value.UNDERLINE, "underline"); - - public static final AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem LINE_THROUGH = - new AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem( - Value.LINE_THROUGH, "line-through"); - - private final Value value; - - private final String string; - - AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem(Value value, String string) { - this.value = value; - this.string = string; - } - - public Value getEnumValue() { - return value; - } - - @java.lang.Override - @JsonValue - public String toString() { - return this.string; - } - - @java.lang.Override - public boolean equals(Object other) { - return (this == other) - || (other instanceof AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem - && this.string.equals( - ((AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem) other) - .string)); - } - - @java.lang.Override - public int hashCode() { - return this.string.hashCode(); - } - - public T visit(Visitor visitor) { - switch (value) { - case WORD: - return visitor.visitWord(); - case UNDERLINE: - return visitor.visitUnderline(); - case LINE_THROUGH: - return visitor.visitLineThrough(); - case UNKNOWN: - default: - return visitor.visitUnknown(string); - } - } - - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem valueOf(String value) { - switch (value) { - case "word": - return WORD; - case "underline": - return UNDERLINE; - case "line-through": - return LINE_THROUGH; - default: - return new AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem( - Value.UNKNOWN, value); - } - } - - public enum Value { - UNDERLINE, - - LINE_THROUGH, - - WORD, - - UNKNOWN - } - - public interface Visitor { - T visitUnderline(); - - T visitLineThrough(); - - T visitWord(); - - T visitUnknown(String unknownType); - } -} diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript.java b/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript.java deleted file mode 100644 index 226fdd4..0000000 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.cloudpdf.api.types; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -public final class AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript { - public static final AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript SUB = - new AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript(Value.SUB, "sub"); - - public static final AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript NORMAL = - new AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript(Value.NORMAL, "normal"); - - public static final AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript SUPER = - new AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript(Value.SUPER, "super"); - - private final Value value; - - private final String string; - - AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript(Value value, String string) { - this.value = value; - this.string = string; - } - - public Value getEnumValue() { - return value; - } - - @java.lang.Override - @JsonValue - public String toString() { - return this.string; - } - - @java.lang.Override - public boolean equals(Object other) { - return (this == other) - || (other instanceof AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript - && this.string.equals( - ((AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript) other).string)); - } - - @java.lang.Override - public int hashCode() { - return this.string.hashCode(); - } - - public T visit(Visitor visitor) { - switch (value) { - case SUB: - return visitor.visitSub(); - case NORMAL: - return visitor.visitNormal(); - case SUPER: - return visitor.visitSuper(); - case UNKNOWN: - default: - return visitor.visitUnknown(string); - } - } - - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript valueOf(String value) { - switch (value) { - case "sub": - return SUB; - case "normal": - return NORMAL; - case "super": - return SUPER; - default: - return new AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript(Value.UNKNOWN, value); - } - } - - public enum Value { - NORMAL, - - SUB, - - SUPER, - - UNKNOWN - } - - public interface Visitor { - T visitNormal(); - - T visitSub(); - - T visitSuper(); - - T visitUnknown(String unknownType); - } -} diff --git a/src/main/java/api/types/AnnotationPatchHighlight.java b/src/main/java/api/types/AnnotationPatchHighlight.java index cb06242..5dd26cf 100644 --- a/src/main/java/api/types/AnnotationPatchHighlight.java +++ b/src/main/java/api/types/AnnotationPatchHighlight.java @@ -86,6 +86,8 @@ public final class AnnotationPatchHighlight { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -126,6 +128,7 @@ private AnnotationPatchHighlight( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional> quadPoints, @@ -161,6 +164,7 @@ private AnnotationPatchHighlight( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -337,6 +341,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -382,6 +394,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -425,6 +443,7 @@ private boolean equalTo(AnnotationPatchHighlight other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && quadPoints.equals(other.quadPoints); @@ -464,6 +483,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints); @@ -542,6 +562,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -585,6 +607,7 @@ public Builder from(AnnotationPatchHighlight other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -987,6 +1010,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1053,6 +1098,7 @@ public AnnotationPatchHighlight build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationPatchInk.java b/src/main/java/api/types/AnnotationPatchInk.java index 5193eec..8915afc 100644 --- a/src/main/java/api/types/AnnotationPatchInk.java +++ b/src/main/java/api/types/AnnotationPatchInk.java @@ -86,6 +86,8 @@ public final class AnnotationPatchInk { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -136,6 +138,7 @@ private AnnotationPatchInk( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional strokeWidth, @@ -176,6 +179,7 @@ private AnnotationPatchInk( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -357,8 +361,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -436,6 +451,18 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -497,6 +524,7 @@ private boolean equalTo(AnnotationPatchInk other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && strokeWidth.equals(other.strokeWidth) @@ -541,6 +569,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -624,6 +653,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -677,6 +708,7 @@ public Builder from(AnnotationPatchInk other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1084,6 +1116,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1095,6 +1149,17 @@ public Builder color(String color) { return this; } + public Builder color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + @JsonSetter(value = "opacity", nulls = Nulls.SKIP) public Builder opacity(Optional opacity) { this.opacity = opacity; @@ -1238,6 +1303,7 @@ public AnnotationPatchInk build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationPatchLine.java b/src/main/java/api/types/AnnotationPatchLine.java index 4671a7a..670df7c 100644 --- a/src/main/java/api/types/AnnotationPatchLine.java +++ b/src/main/java/api/types/AnnotationPatchLine.java @@ -86,6 +86,8 @@ public final class AnnotationPatchLine { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -150,6 +152,7 @@ private AnnotationPatchLine( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional strokeWidth, @@ -197,6 +200,7 @@ private AnnotationPatchLine( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -385,8 +389,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -514,6 +529,18 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -605,6 +632,7 @@ private boolean equalTo(AnnotationPatchLine other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && strokeWidth.equals(other.strokeWidth) @@ -656,6 +684,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -746,6 +775,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -813,6 +844,7 @@ public Builder from(AnnotationPatchLine other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1227,6 +1259,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1238,6 +1292,17 @@ public Builder color(String color) { return this; } + public Builder color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + @JsonSetter(value = "opacity", nulls = Nulls.SKIP) public Builder opacity(Optional opacity) { this.opacity = opacity; @@ -1513,6 +1578,7 @@ public AnnotationPatchLine build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationPatchPolygon.java b/src/main/java/api/types/AnnotationPatchPolygon.java index e4473c8..5e0aebd 100644 --- a/src/main/java/api/types/AnnotationPatchPolygon.java +++ b/src/main/java/api/types/AnnotationPatchPolygon.java @@ -86,6 +86,8 @@ public final class AnnotationPatchPolygon { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -146,6 +148,7 @@ private AnnotationPatchPolygon( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional strokeWidth, @@ -191,6 +194,7 @@ private AnnotationPatchPolygon( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -377,8 +381,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -496,6 +511,18 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -587,6 +614,7 @@ private boolean equalTo(AnnotationPatchPolygon other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && strokeWidth.equals(other.strokeWidth) @@ -636,6 +664,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -724,6 +753,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -787,6 +818,7 @@ public Builder from(AnnotationPatchPolygon other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1199,6 +1231,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1210,6 +1264,17 @@ public Builder color(String color) { return this; } + public Builder color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + @JsonSetter(value = "opacity", nulls = Nulls.SKIP) public Builder opacity(Optional opacity) { this.opacity = opacity; @@ -1463,6 +1528,7 @@ public AnnotationPatchPolygon build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationPatchPolyline.java b/src/main/java/api/types/AnnotationPatchPolyline.java index 5d642c5..0262374 100644 --- a/src/main/java/api/types/AnnotationPatchPolyline.java +++ b/src/main/java/api/types/AnnotationPatchPolyline.java @@ -86,6 +86,8 @@ public final class AnnotationPatchPolyline { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -146,6 +148,7 @@ private AnnotationPatchPolyline( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional strokeWidth, @@ -191,6 +194,7 @@ private AnnotationPatchPolyline( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -377,8 +381,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -493,6 +508,18 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -578,6 +605,7 @@ private boolean equalTo(AnnotationPatchPolyline other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && strokeWidth.equals(other.strokeWidth) @@ -627,6 +655,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -715,6 +744,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -778,6 +809,7 @@ public Builder from(AnnotationPatchPolyline other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1190,6 +1222,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1201,6 +1255,17 @@ public Builder color(String color) { return this; } + public Builder color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + @JsonSetter(value = "opacity", nulls = Nulls.SKIP) public Builder opacity(Optional opacity) { this.opacity = opacity; @@ -1443,6 +1508,7 @@ public AnnotationPatchPolyline build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationPatchRedact.java b/src/main/java/api/types/AnnotationPatchRedact.java index 24df20a..15dba78 100644 --- a/src/main/java/api/types/AnnotationPatchRedact.java +++ b/src/main/java/api/types/AnnotationPatchRedact.java @@ -86,6 +86,8 @@ public final class AnnotationPatchRedact { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -140,6 +142,7 @@ private AnnotationPatchRedact( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional> quadPoints, @@ -182,6 +185,7 @@ private AnnotationPatchRedact( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -365,6 +369,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -451,6 +463,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("interiorColor") private Optional _getInteriorColor() { @@ -506,6 +524,7 @@ private boolean equalTo(AnnotationPatchRedact other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && quadPoints.equals(other.quadPoints) @@ -552,6 +571,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints, @@ -637,6 +657,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -694,6 +716,7 @@ public Builder from(AnnotationPatchRedact other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -1103,6 +1126,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1268,6 +1313,7 @@ public AnnotationPatchRedact build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationPatchSquare.java b/src/main/java/api/types/AnnotationPatchSquare.java index bd8c221..7257827 100644 --- a/src/main/java/api/types/AnnotationPatchSquare.java +++ b/src/main/java/api/types/AnnotationPatchSquare.java @@ -86,6 +86,8 @@ public final class AnnotationPatchSquare { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -138,6 +140,7 @@ private AnnotationPatchSquare( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional strokeWidth, @@ -179,6 +182,7 @@ private AnnotationPatchSquare( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -361,8 +365,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -448,6 +463,18 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -515,6 +542,7 @@ private boolean equalTo(AnnotationPatchSquare other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && strokeWidth.equals(other.strokeWidth) @@ -560,6 +588,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -644,6 +673,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -699,6 +730,7 @@ public Builder from(AnnotationPatchSquare other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1107,6 +1139,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1118,6 +1172,17 @@ public Builder color(String color) { return this; } + public Builder color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + @JsonSetter(value = "opacity", nulls = Nulls.SKIP) public Builder opacity(Optional opacity) { this.opacity = opacity; @@ -1283,6 +1348,7 @@ public AnnotationPatchSquare build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationPatchSquiggly.java b/src/main/java/api/types/AnnotationPatchSquiggly.java index be5ec72..fbf7c70 100644 --- a/src/main/java/api/types/AnnotationPatchSquiggly.java +++ b/src/main/java/api/types/AnnotationPatchSquiggly.java @@ -86,6 +86,8 @@ public final class AnnotationPatchSquiggly { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -126,6 +128,7 @@ private AnnotationPatchSquiggly( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional> quadPoints, @@ -161,6 +164,7 @@ private AnnotationPatchSquiggly( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -337,6 +341,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -382,6 +394,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -425,6 +443,7 @@ private boolean equalTo(AnnotationPatchSquiggly other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && quadPoints.equals(other.quadPoints); @@ -464,6 +483,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints); @@ -542,6 +562,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -585,6 +607,7 @@ public Builder from(AnnotationPatchSquiggly other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -987,6 +1010,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1053,6 +1098,7 @@ public AnnotationPatchSquiggly build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationPatchStamp.java b/src/main/java/api/types/AnnotationPatchStamp.java index 09890f9..0ed2e6d 100644 --- a/src/main/java/api/types/AnnotationPatchStamp.java +++ b/src/main/java/api/types/AnnotationPatchStamp.java @@ -85,6 +85,8 @@ public final class AnnotationPatchStamp { private final Optional actions; + private final Optional richText; + private final Optional box; private final Optional rotation; @@ -129,6 +131,7 @@ private AnnotationPatchStamp( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional box, Optional rotation, Optional name, @@ -166,6 +169,7 @@ private AnnotationPatchStamp( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.box = box; this.rotation = rotation; this.name = name; @@ -344,6 +348,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("box") public Optional getBox() { return box; @@ -408,6 +420,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("rotation") private Optional _getRotation() { @@ -469,6 +487,7 @@ private boolean equalTo(AnnotationPatchStamp other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && box.equals(other.box) && rotation.equals(other.rotation) && name.equals(other.name) @@ -510,6 +529,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.box, this.rotation, this.name, @@ -590,6 +610,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional box = Optional.empty(); private Optional rotation = Optional.empty(); @@ -637,6 +659,7 @@ public Builder from(AnnotationPatchStamp other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); box(other.getBox()); rotation(other.getRotation()); name(other.getName()); @@ -1041,6 +1064,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "box", nulls = Nulls.SKIP) public Builder box(Optional box) { this.box = box; @@ -1162,6 +1207,7 @@ public AnnotationPatchStamp build() { modifiedBy, importedBy, actions, + richText, box, rotation, name, diff --git a/src/main/java/api/types/AnnotationPatchStrikeout.java b/src/main/java/api/types/AnnotationPatchStrikeout.java index 4df734f..4aa3b0d 100644 --- a/src/main/java/api/types/AnnotationPatchStrikeout.java +++ b/src/main/java/api/types/AnnotationPatchStrikeout.java @@ -86,6 +86,8 @@ public final class AnnotationPatchStrikeout { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -128,6 +130,7 @@ private AnnotationPatchStrikeout( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional> quadPoints, @@ -164,6 +167,7 @@ private AnnotationPatchStrikeout( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -341,6 +345,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -394,6 +406,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("intent") private Optional _getIntent() { @@ -443,6 +461,7 @@ private boolean equalTo(AnnotationPatchStrikeout other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && quadPoints.equals(other.quadPoints) @@ -483,6 +502,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints, @@ -562,6 +582,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -607,6 +629,7 @@ public Builder from(AnnotationPatchStrikeout other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -1010,6 +1033,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1098,6 +1143,7 @@ public AnnotationPatchStrikeout build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationPatchText.java b/src/main/java/api/types/AnnotationPatchText.java index a7d144c..d435ba1 100644 --- a/src/main/java/api/types/AnnotationPatchText.java +++ b/src/main/java/api/types/AnnotationPatchText.java @@ -85,6 +85,8 @@ public final class AnnotationPatchText { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -131,6 +133,7 @@ private AnnotationPatchText( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional icon, @@ -169,6 +172,7 @@ private AnnotationPatchText( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.icon = icon; @@ -348,6 +352,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -414,6 +426,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("state") private Optional _getState() { @@ -469,6 +487,7 @@ private boolean equalTo(AnnotationPatchText other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && icon.equals(other.icon) @@ -511,6 +530,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.icon, @@ -592,6 +612,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -641,6 +663,7 @@ public Builder from(AnnotationPatchText other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); icon(other.getIcon()); @@ -1046,6 +1069,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1167,6 +1212,7 @@ public AnnotationPatchText build() { modifiedBy, importedBy, actions, + richText, color, opacity, icon, diff --git a/src/main/java/api/types/AnnotationPatchUnderline.java b/src/main/java/api/types/AnnotationPatchUnderline.java index 61913e2..3cf5692 100644 --- a/src/main/java/api/types/AnnotationPatchUnderline.java +++ b/src/main/java/api/types/AnnotationPatchUnderline.java @@ -86,6 +86,8 @@ public final class AnnotationPatchUnderline { private final Optional actions; + private final Optional richText; + private final Optional color; private final Optional opacity; @@ -126,6 +128,7 @@ private AnnotationPatchUnderline( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, Optional color, Optional opacity, Optional> quadPoints, @@ -161,6 +164,7 @@ private AnnotationPatchUnderline( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -337,6 +341,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public Optional getColor() { return color; @@ -382,6 +394,12 @@ private Optional _getGroupId() { return groupId; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -425,6 +443,7 @@ private boolean equalTo(AnnotationPatchUnderline other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity.equals(other.opacity) && quadPoints.equals(other.quadPoints); @@ -464,6 +483,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints); @@ -542,6 +562,8 @@ public static final class Builder { private Optional actions = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional color = Optional.empty(); private Optional opacity = Optional.empty(); @@ -585,6 +607,7 @@ public Builder from(AnnotationPatchUnderline other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -987,6 +1010,28 @@ public Builder actions(Object actions) { return this; } + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public Builder richText(Optional richText) { + this.richText = richText; + return this; + } + + public Builder richText(RichTextDocumentInput richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + public Builder richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + @JsonSetter(value = "color", nulls = Nulls.SKIP) public Builder color(Optional color) { this.color = color; @@ -1053,6 +1098,7 @@ public AnnotationPatchUnderline build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationPolygon.java b/src/main/java/api/types/AnnotationPolygon.java index 86d30f2..578aa0a 100644 --- a/src/main/java/api/types/AnnotationPolygon.java +++ b/src/main/java/api/types/AnnotationPolygon.java @@ -89,7 +89,9 @@ public final class AnnotationPolygon { private final Optional actions; - private final String color; + private final Optional richText; + + private final Optional color; private final double opacity; @@ -149,7 +151,8 @@ private AnnotationPolygon( Optional modifiedBy, Optional importedBy, Optional actions, - String color, + Optional richText, + Optional color, double opacity, double strokeWidth, AnnotationPolygonBorderStyle borderStyle, @@ -194,6 +197,7 @@ private AnnotationPolygon( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -413,8 +417,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") - public String getColor() { + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore + public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -598,6 +613,18 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -689,6 +716,7 @@ private boolean equalTo(AnnotationPolygon other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && strokeWidth == other.strokeWidth @@ -738,6 +766,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -821,11 +850,7 @@ public interface ToggleNoViewStage { } public interface LockedContentsStage { - ColorStage lockedContents(boolean lockedContents); - } - - public interface ColorStage { - OpacityStage color(@NotNull String color); + OpacityStage lockedContents(boolean lockedContents); } public interface OpacityStage { @@ -943,6 +968,18 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + + _FinalStage color(Optional color); + + _FinalStage color(String color); + + _FinalStage color(Nullable color); + _FinalStage dashArray(Optional> dashArray); _FinalStage dashArray(List dashArray); @@ -1015,7 +1052,6 @@ public static final class Builder LockedStage, ToggleNoViewStage, LockedContentsStage, - ColorStage, OpacityStage, StrokeWidthStage, BorderStyleStage, @@ -1050,8 +1086,6 @@ public static final class Builder private boolean lockedContents; - private String color; - private double opacity; private double strokeWidth; @@ -1076,6 +1110,10 @@ public static final class Builder private Optional> dashArray = Optional.empty(); + private Optional color = Optional.empty(); + + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -1146,6 +1184,7 @@ public Builder from(AnnotationPolygon other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1262,18 +1301,11 @@ public LockedContentsStage toggleNoView(boolean toggleNoView) { @java.lang.Override @JsonSetter("lockedContents") - public ColorStage lockedContents(boolean lockedContents) { + public OpacityStage lockedContents(boolean lockedContents) { this.lockedContents = lockedContents; return this; } - @java.lang.Override - @JsonSetter("color") - public OpacityStage color(@NotNull String color) { - this.color = Objects.requireNonNull(color, "color must not be null"); - return this; - } - @java.lang.Override @JsonSetter("opacity") public StrokeWidthStage opacity(double opacity) { @@ -1519,6 +1551,56 @@ public _FinalStage dashArray(Optional> dashArray) { return this; } + @java.lang.Override + public _FinalStage color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage color(String color) { + this.color = Optional.ofNullable(color); + return this; + } + + @java.lang.Override + @JsonSetter(value = "color", nulls = Nulls.SKIP) + public _FinalStage color(Optional color) { + this.color = color; + return this; + } + + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1953,6 +2035,7 @@ public AnnotationPolygon build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationPolyline.java b/src/main/java/api/types/AnnotationPolyline.java index 16172f3..956c2b2 100644 --- a/src/main/java/api/types/AnnotationPolyline.java +++ b/src/main/java/api/types/AnnotationPolyline.java @@ -89,7 +89,9 @@ public final class AnnotationPolyline { private final Optional actions; - private final String color; + private final Optional richText; + + private final Optional color; private final double opacity; @@ -149,7 +151,8 @@ private AnnotationPolyline( Optional modifiedBy, Optional importedBy, Optional actions, - String color, + Optional richText, + Optional color, double opacity, double strokeWidth, AnnotationPolylineBorderStyle borderStyle, @@ -194,6 +197,7 @@ private AnnotationPolyline( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -413,8 +417,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") - public String getColor() { + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore + public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -595,6 +610,18 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -680,6 +707,7 @@ private boolean equalTo(AnnotationPolyline other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && strokeWidth == other.strokeWidth @@ -729,6 +757,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -812,11 +841,7 @@ public interface ToggleNoViewStage { } public interface LockedContentsStage { - ColorStage lockedContents(boolean lockedContents); - } - - public interface ColorStage { - OpacityStage color(@NotNull String color); + OpacityStage lockedContents(boolean lockedContents); } public interface OpacityStage { @@ -938,6 +963,18 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + + _FinalStage color(Optional color); + + _FinalStage color(String color); + + _FinalStage color(Nullable color); + _FinalStage dashArray(Optional> dashArray); _FinalStage dashArray(List dashArray); @@ -1004,7 +1041,6 @@ public static final class Builder LockedStage, ToggleNoViewStage, LockedContentsStage, - ColorStage, OpacityStage, StrokeWidthStage, BorderStyleStage, @@ -1040,8 +1076,6 @@ public static final class Builder private boolean lockedContents; - private String color; - private double opacity; private double strokeWidth; @@ -1066,6 +1100,10 @@ public static final class Builder private Optional> dashArray = Optional.empty(); + private Optional color = Optional.empty(); + + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -1136,6 +1174,7 @@ public Builder from(AnnotationPolyline other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1252,18 +1291,11 @@ public LockedContentsStage toggleNoView(boolean toggleNoView) { @java.lang.Override @JsonSetter("lockedContents") - public ColorStage lockedContents(boolean lockedContents) { + public OpacityStage lockedContents(boolean lockedContents) { this.lockedContents = lockedContents; return this; } - @java.lang.Override - @JsonSetter("color") - public OpacityStage color(@NotNull String color) { - this.color = Objects.requireNonNull(color, "color must not be null"); - return this; - } - @java.lang.Override @JsonSetter("opacity") public StrokeWidthStage opacity(double opacity) { @@ -1491,6 +1523,56 @@ public _FinalStage dashArray(Optional> dashArray) { return this; } + @java.lang.Override + public _FinalStage color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage color(String color) { + this.color = Optional.ofNullable(color); + return this; + } + + @java.lang.Override + @JsonSetter(value = "color", nulls = Nulls.SKIP) + public _FinalStage color(Optional color) { + this.color = color; + return this; + } + + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1925,6 +2007,7 @@ public AnnotationPolyline build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationRedact.java b/src/main/java/api/types/AnnotationRedact.java index 9cd173f..a1a4f67 100644 --- a/src/main/java/api/types/AnnotationRedact.java +++ b/src/main/java/api/types/AnnotationRedact.java @@ -89,6 +89,8 @@ public final class AnnotationRedact { private final Optional actions; + private final Optional richText; + private final String color; private final double opacity; @@ -143,6 +145,7 @@ private AnnotationRedact( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, String color, double opacity, List quadPoints, @@ -185,6 +188,7 @@ private AnnotationRedact( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -401,6 +405,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public String getColor() { return color; @@ -553,6 +565,12 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("interiorColor") private Optional _getInteriorColor() { @@ -608,6 +626,7 @@ private boolean equalTo(AnnotationRedact other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && quadPoints.equals(other.quadPoints) @@ -654,6 +673,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints, @@ -868,6 +888,12 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + _FinalStage quadPoints(List quadPoints); _FinalStage addQuadPoints(AnnotationRedactQuadPointsItem quadPoints); @@ -962,6 +988,8 @@ public static final class Builder private List quadPoints = new ArrayList<>(); + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -1032,6 +1060,7 @@ public Builder from(AnnotationRedact other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -1273,6 +1302,31 @@ public _FinalStage quadPoints(List quadPoints) { return this; } + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1707,6 +1761,7 @@ public AnnotationRedact build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationSquare.java b/src/main/java/api/types/AnnotationSquare.java index 0332b65..9e1c5ed 100644 --- a/src/main/java/api/types/AnnotationSquare.java +++ b/src/main/java/api/types/AnnotationSquare.java @@ -88,7 +88,9 @@ public final class AnnotationSquare { private final Optional actions; - private final String color; + private final Optional richText; + + private final Optional color; private final double opacity; @@ -140,7 +142,8 @@ private AnnotationSquare( Optional modifiedBy, Optional importedBy, Optional actions, - String color, + Optional richText, + Optional color, double opacity, double strokeWidth, AnnotationSquareBorderStyle borderStyle, @@ -181,6 +184,7 @@ private AnnotationSquare( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.strokeWidth = strokeWidth; @@ -396,8 +400,19 @@ public Optional getActions() { return actions; } - @JsonProperty("color") - public String getColor() { + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + + @JsonIgnore + public Optional getColor() { + if (color == null) { + return Optional.empty(); + } return color; } @@ -549,6 +564,18 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("color") + private Optional _getColor() { + return color; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("dashArray") private Optional> _getDashArray() { @@ -616,6 +643,7 @@ private boolean equalTo(AnnotationSquare other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && strokeWidth == other.strokeWidth @@ -661,6 +689,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.strokeWidth, @@ -740,11 +769,7 @@ public interface ToggleNoViewStage { } public interface LockedContentsStage { - ColorStage lockedContents(boolean lockedContents); - } - - public interface ColorStage { - OpacityStage color(@NotNull String color); + OpacityStage lockedContents(boolean lockedContents); } public interface OpacityStage { @@ -866,6 +891,18 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + + _FinalStage color(Optional color); + + _FinalStage color(String color); + + _FinalStage color(Nullable color); + _FinalStage dashArray(Optional> dashArray); _FinalStage dashArray(List dashArray); @@ -908,7 +945,6 @@ public static final class Builder LockedStage, ToggleNoViewStage, LockedContentsStage, - ColorStage, OpacityStage, StrokeWidthStage, BorderStyleStage, @@ -944,8 +980,6 @@ public static final class Builder private boolean lockedContents; - private String color; - private double opacity; private double strokeWidth; @@ -962,6 +996,10 @@ public static final class Builder private Optional> dashArray = Optional.empty(); + private Optional color = Optional.empty(); + + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -1032,6 +1070,7 @@ public Builder from(AnnotationSquare other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); strokeWidth(other.getStrokeWidth()); @@ -1144,18 +1183,11 @@ public LockedContentsStage toggleNoView(boolean toggleNoView) { @java.lang.Override @JsonSetter("lockedContents") - public ColorStage lockedContents(boolean lockedContents) { + public OpacityStage lockedContents(boolean lockedContents) { this.lockedContents = lockedContents; return this; } - @java.lang.Override - @JsonSetter("color") - public OpacityStage color(@NotNull String color) { - this.color = Objects.requireNonNull(color, "color must not be null"); - return this; - } - @java.lang.Override @JsonSetter("opacity") public StrokeWidthStage opacity(double opacity) { @@ -1284,6 +1316,56 @@ public _FinalStage dashArray(Optional> dashArray) { return this; } + @java.lang.Override + public _FinalStage color(Nullable color) { + if (color.isNull()) { + this.color = null; + } else if (color.isEmpty()) { + this.color = Optional.empty(); + } else { + this.color = Optional.of(color.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage color(String color) { + this.color = Optional.ofNullable(color); + return this; + } + + @java.lang.Override + @JsonSetter(value = "color", nulls = Nulls.SKIP) + public _FinalStage color(Optional color) { + this.color = color; + return this; + } + + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1718,6 +1800,7 @@ public AnnotationSquare build() { modifiedBy, importedBy, actions, + richText, color, opacity, strokeWidth, diff --git a/src/main/java/api/types/AnnotationSquiggly.java b/src/main/java/api/types/AnnotationSquiggly.java index 248c46f..778fd44 100644 --- a/src/main/java/api/types/AnnotationSquiggly.java +++ b/src/main/java/api/types/AnnotationSquiggly.java @@ -89,6 +89,8 @@ public final class AnnotationSquiggly { private final Optional actions; + private final Optional richText; + private final String color; private final double opacity; @@ -129,6 +131,7 @@ private AnnotationSquiggly( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, String color, double opacity, List quadPoints, @@ -164,6 +167,7 @@ private AnnotationSquiggly( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -373,6 +377,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public String getColor() { return color; @@ -484,6 +496,12 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -527,6 +545,7 @@ private boolean equalTo(AnnotationSquiggly other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && quadPoints.equals(other.quadPoints); @@ -566,6 +585,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints); @@ -753,6 +773,12 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + _FinalStage quadPoints(List quadPoints); _FinalStage addQuadPoints(AnnotationSquigglyQuadPointsItem quadPoints); @@ -816,6 +842,8 @@ public static final class Builder private List quadPoints = new ArrayList<>(); + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -886,6 +914,7 @@ public Builder from(AnnotationSquiggly other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -1035,6 +1064,31 @@ public _FinalStage quadPoints(List quadPoints) return this; } + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1469,6 +1523,7 @@ public AnnotationSquiggly build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationStamp.java b/src/main/java/api/types/AnnotationStamp.java index 3800bd8..f642e34 100644 --- a/src/main/java/api/types/AnnotationStamp.java +++ b/src/main/java/api/types/AnnotationStamp.java @@ -88,6 +88,8 @@ public final class AnnotationStamp { private final Optional actions; + private final Optional richText; + private final AnnotationStampBox box; private final Optional rotation; @@ -132,6 +134,7 @@ private AnnotationStamp( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, AnnotationStampBox box, Optional rotation, Optional name, @@ -169,6 +172,7 @@ private AnnotationStamp( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.box = box; this.rotation = rotation; this.name = name; @@ -380,6 +384,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("box") public AnnotationStampBox getBox() { return box; @@ -510,6 +522,12 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("rotation") private Optional _getRotation() { @@ -571,6 +589,7 @@ private boolean equalTo(AnnotationStamp other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && box.equals(other.box) && rotation.equals(other.rotation) && name.equals(other.name) @@ -612,6 +631,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.box, this.rotation, this.name, @@ -801,6 +821,12 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + _FinalStage rotation(Optional rotation); _FinalStage rotation(Double rotation); @@ -880,6 +906,8 @@ public static final class Builder private Optional rotation = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -950,6 +978,7 @@ public Builder from(AnnotationStamp other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); box(other.getBox()); rotation(other.getRotation()); name(other.getName()); @@ -1152,6 +1181,31 @@ public _FinalStage rotation(Optional rotation) { return this; } + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1586,6 +1640,7 @@ public AnnotationStamp build() { modifiedBy, importedBy, actions, + richText, box, rotation, name, diff --git a/src/main/java/api/types/AnnotationStrikeout.java b/src/main/java/api/types/AnnotationStrikeout.java index aa5034e..309987f 100644 --- a/src/main/java/api/types/AnnotationStrikeout.java +++ b/src/main/java/api/types/AnnotationStrikeout.java @@ -89,6 +89,8 @@ public final class AnnotationStrikeout { private final Optional actions; + private final Optional richText; + private final String color; private final double opacity; @@ -131,6 +133,7 @@ private AnnotationStrikeout( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, String color, double opacity, List quadPoints, @@ -167,6 +170,7 @@ private AnnotationStrikeout( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -377,6 +381,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public String getColor() { return color; @@ -496,6 +508,12 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("intent") private Optional _getIntent() { @@ -545,6 +563,7 @@ private boolean equalTo(AnnotationStrikeout other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && quadPoints.equals(other.quadPoints) @@ -585,6 +604,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints, @@ -773,6 +793,12 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + _FinalStage quadPoints(List quadPoints); _FinalStage addQuadPoints(AnnotationStrikeoutQuadPointsItem quadPoints); @@ -844,6 +870,8 @@ public static final class Builder private List quadPoints = new ArrayList<>(); + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -914,6 +942,7 @@ public Builder from(AnnotationStrikeout other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -1089,6 +1118,31 @@ public _FinalStage quadPoints(List quadPoints return this; } + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1523,6 +1577,7 @@ public AnnotationStrikeout build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/AnnotationText.java b/src/main/java/api/types/AnnotationText.java index 96392cc..836a9d4 100644 --- a/src/main/java/api/types/AnnotationText.java +++ b/src/main/java/api/types/AnnotationText.java @@ -88,6 +88,8 @@ public final class AnnotationText { private final Optional actions; + private final Optional richText; + private final String color; private final double opacity; @@ -134,6 +136,7 @@ private AnnotationText( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, String color, double opacity, AnnotationTextIcon icon, @@ -172,6 +175,7 @@ private AnnotationText( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.icon = icon; @@ -384,6 +388,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public String getColor() { return color; @@ -516,6 +528,12 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) @JsonProperty("state") private Optional _getState() { @@ -571,6 +589,7 @@ private boolean equalTo(AnnotationText other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && icon.equals(other.icon) @@ -613,6 +632,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.icon, @@ -811,6 +831,12 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + _FinalStage state(Optional state); _FinalStage state(String state); @@ -888,6 +914,8 @@ public static final class Builder private Optional state = Optional.empty(); + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -958,6 +986,7 @@ public Builder from(AnnotationText other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); icon(other.getIcon()); @@ -1150,6 +1179,31 @@ public _FinalStage state(Optional state) { return this; } + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1584,6 +1638,7 @@ public AnnotationText build() { modifiedBy, importedBy, actions, + richText, color, opacity, icon, diff --git a/src/main/java/api/types/AnnotationUnderline.java b/src/main/java/api/types/AnnotationUnderline.java index d54219b..2149d92 100644 --- a/src/main/java/api/types/AnnotationUnderline.java +++ b/src/main/java/api/types/AnnotationUnderline.java @@ -89,6 +89,8 @@ public final class AnnotationUnderline { private final Optional actions; + private final Optional richText; + private final String color; private final double opacity; @@ -129,6 +131,7 @@ private AnnotationUnderline( Optional modifiedBy, Optional importedBy, Optional actions, + Optional richText, String color, double opacity, List quadPoints, @@ -164,6 +167,7 @@ private AnnotationUnderline( this.modifiedBy = modifiedBy; this.importedBy = importedBy; this.actions = actions; + this.richText = richText; this.color = color; this.opacity = opacity; this.quadPoints = quadPoints; @@ -373,6 +377,14 @@ public Optional getActions() { return actions; } + @JsonIgnore + public Optional getRichText() { + if (richText == null) { + return Optional.empty(); + } + return richText; + } + @JsonProperty("color") public String getColor() { return color; @@ -484,6 +496,12 @@ private Optional _getActions() { return actions; } + @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = NullableNonemptyFilter.class) + @JsonProperty("richText") + private Optional _getRichText() { + return richText; + } + @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -527,6 +545,7 @@ private boolean equalTo(AnnotationUnderline other) { && modifiedBy.equals(other.modifiedBy) && importedBy.equals(other.importedBy) && actions.equals(other.actions) + && richText.equals(other.richText) && color.equals(other.color) && opacity == other.opacity && quadPoints.equals(other.quadPoints); @@ -566,6 +585,7 @@ public int hashCode() { this.modifiedBy, this.importedBy, this.actions, + this.richText, this.color, this.opacity, this.quadPoints); @@ -753,6 +773,12 @@ public interface _FinalStage { _FinalStage actions(Nullable actions); + _FinalStage richText(Optional richText); + + _FinalStage richText(RichTextDocument richText); + + _FinalStage richText(Nullable richText); + _FinalStage quadPoints(List quadPoints); _FinalStage addQuadPoints(AnnotationUnderlineQuadPointsItem quadPoints); @@ -816,6 +842,8 @@ public static final class Builder private List quadPoints = new ArrayList<>(); + private Optional richText = Optional.empty(); + private Optional actions = Optional.empty(); private Optional importedBy = Optional.empty(); @@ -886,6 +914,7 @@ public Builder from(AnnotationUnderline other) { modifiedBy(other.getModifiedBy()); importedBy(other.getImportedBy()); actions(other.getActions()); + richText(other.getRichText()); color(other.getColor()); opacity(other.getOpacity()); quadPoints(other.getQuadPoints()); @@ -1035,6 +1064,31 @@ public _FinalStage quadPoints(List quadPoints return this; } + @java.lang.Override + public _FinalStage richText(Nullable richText) { + if (richText.isNull()) { + this.richText = null; + } else if (richText.isEmpty()) { + this.richText = Optional.empty(); + } else { + this.richText = Optional.of(richText.get()); + } + return this; + } + + @java.lang.Override + public _FinalStage richText(RichTextDocument richText) { + this.richText = Optional.ofNullable(richText); + return this; + } + + @java.lang.Override + @JsonSetter(value = "richText", nulls = Nulls.SKIP) + public _FinalStage richText(Optional richText) { + this.richText = richText; + return this; + } + @java.lang.Override public _FinalStage actions(Nullable actions) { if (actions.isNull()) { @@ -1469,6 +1523,7 @@ public AnnotationUnderline build() { modifiedBy, importedBy, actions, + richText, color, opacity, quadPoints, diff --git a/src/main/java/api/types/DeploymentModulesResponse.java b/src/main/java/api/types/DeploymentModulesResponse.java new file mode 100644 index 0000000..4438050 --- /dev/null +++ b/src/main/java/api/types/DeploymentModulesResponse.java @@ -0,0 +1,116 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.cloudpdf.api.types; + +import com.cloudpdf.api.core.ObjectMappers; +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 java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = DeploymentModulesResponse.Builder.class) +public final class DeploymentModulesResponse { + private final List modules; + + private final Map additionalProperties; + + private DeploymentModulesResponse(List modules, Map additionalProperties) { + this.modules = modules; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("modules") + public List getModules() { + return modules; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof DeploymentModulesResponse && equalTo((DeploymentModulesResponse) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(DeploymentModulesResponse other) { + return modules.equals(other.modules); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.modules); + } + + @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 List modules = new ArrayList<>(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + public Builder from(DeploymentModulesResponse other) { + modules(other.getModules()); + return this; + } + + @JsonSetter(value = "modules", nulls = Nulls.SKIP) + public Builder modules(List modules) { + this.modules.clear(); + if (modules != null) { + this.modules.addAll(modules); + } + return this; + } + + public Builder addModules(ModuleManifest modules) { + this.modules.add(modules); + return this; + } + + public Builder addAllModules(List modules) { + if (modules != null) { + this.modules.addAll(modules); + } + return this; + } + + public DeploymentModulesResponse build() { + return new DeploymentModulesResponse(modules, additionalProperties); + } + + public Builder additionalProperty(String key, Object value) { + this.additionalProperties.put(key, value); + return this; + } + + public Builder additionalProperties(Map additionalProperties) { + this.additionalProperties.putAll(additionalProperties); + return this; + } + } +} diff --git a/src/main/java/api/types/ModuleManifest.java b/src/main/java/api/types/ModuleManifest.java new file mode 100644 index 0000000..cdc8e97 --- /dev/null +++ b/src/main/java/api/types/ModuleManifest.java @@ -0,0 +1,288 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.cloudpdf.api.types; + +import com.cloudpdf.api.core.ObjectMappers; +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 java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import org.jetbrains.annotations.NotNull; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = ModuleManifest.Builder.class) +public final class ModuleManifest { + private final String id; + + private final String name; + + private final Optional description; + + private final List permissions; + + private final List meters; + + private final ModuleManifestRequires requires; + + private final Map additionalProperties; + + private ModuleManifest( + String id, + String name, + Optional description, + List permissions, + List meters, + ModuleManifestRequires requires, + Map additionalProperties) { + this.id = id; + this.name = name; + this.description = description; + this.permissions = permissions; + this.meters = meters; + this.requires = requires; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("id") + public String getId() { + return id; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("description") + public Optional getDescription() { + return description; + } + + @JsonProperty("permissions") + public List getPermissions() { + return permissions; + } + + @JsonProperty("meters") + public List getMeters() { + return meters; + } + + @JsonProperty("requires") + public ModuleManifestRequires getRequires() { + return requires; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof ModuleManifest && equalTo((ModuleManifest) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(ModuleManifest other) { + return id.equals(other.id) + && name.equals(other.name) + && description.equals(other.description) + && permissions.equals(other.permissions) + && meters.equals(other.meters) + && requires.equals(other.requires); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.id, this.name, this.description, this.permissions, this.meters, this.requires); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static IdStage builder() { + return new Builder(); + } + + public interface IdStage { + NameStage id(@NotNull String id); + + Builder from(ModuleManifest other); + } + + public interface NameStage { + RequiresStage name(@NotNull String name); + } + + public interface RequiresStage { + _FinalStage requires(@NotNull ModuleManifestRequires requires); + } + + public interface _FinalStage { + ModuleManifest build(); + + _FinalStage additionalProperty(String key, Object value); + + _FinalStage additionalProperties(Map additionalProperties); + + _FinalStage description(Optional description); + + _FinalStage description(String description); + + _FinalStage permissions(List permissions); + + _FinalStage addPermissions(ModulePermission permissions); + + _FinalStage addAllPermissions(List permissions); + + _FinalStage meters(List meters); + + _FinalStage addMeters(ModuleMeter meters); + + _FinalStage addAllMeters(List meters); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder implements IdStage, NameStage, RequiresStage, _FinalStage { + private String id; + + private String name; + + private ModuleManifestRequires requires; + + private List meters = new ArrayList<>(); + + private List permissions = new ArrayList<>(); + + private Optional description = Optional.empty(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(ModuleManifest other) { + id(other.getId()); + name(other.getName()); + description(other.getDescription()); + permissions(other.getPermissions()); + meters(other.getMeters()); + requires(other.getRequires()); + return this; + } + + @java.lang.Override + @JsonSetter("id") + public NameStage id(@NotNull String id) { + this.id = Objects.requireNonNull(id, "id must not be null"); + return this; + } + + @java.lang.Override + @JsonSetter("name") + public RequiresStage name(@NotNull String name) { + this.name = Objects.requireNonNull(name, "name must not be null"); + return this; + } + + @java.lang.Override + @JsonSetter("requires") + public _FinalStage requires(@NotNull ModuleManifestRequires requires) { + this.requires = Objects.requireNonNull(requires, "requires must not be null"); + return this; + } + + @java.lang.Override + public _FinalStage addAllMeters(List meters) { + if (meters != null) { + this.meters.addAll(meters); + } + return this; + } + + @java.lang.Override + public _FinalStage addMeters(ModuleMeter meters) { + this.meters.add(meters); + return this; + } + + @java.lang.Override + @JsonSetter(value = "meters", nulls = Nulls.SKIP) + public _FinalStage meters(List meters) { + this.meters.clear(); + if (meters != null) { + this.meters.addAll(meters); + } + return this; + } + + @java.lang.Override + public _FinalStage addAllPermissions(List permissions) { + if (permissions != null) { + this.permissions.addAll(permissions); + } + return this; + } + + @java.lang.Override + public _FinalStage addPermissions(ModulePermission permissions) { + this.permissions.add(permissions); + return this; + } + + @java.lang.Override + @JsonSetter(value = "permissions", nulls = Nulls.SKIP) + public _FinalStage permissions(List permissions) { + this.permissions.clear(); + if (permissions != null) { + this.permissions.addAll(permissions); + } + return this; + } + + @java.lang.Override + public _FinalStage description(String description) { + this.description = Optional.ofNullable(description); + return this; + } + + @java.lang.Override + @JsonSetter(value = "description", nulls = Nulls.SKIP) + public _FinalStage description(Optional description) { + this.description = description; + return this; + } + + @java.lang.Override + public ModuleManifest build() { + return new ModuleManifest(id, name, description, permissions, meters, requires, additionalProperties); + } + + @java.lang.Override + public Builder additionalProperty(String key, Object value) { + this.additionalProperties.put(key, value); + return this; + } + + @java.lang.Override + public Builder additionalProperties(Map additionalProperties) { + this.additionalProperties.putAll(additionalProperties); + return this; + } + } +} diff --git a/src/main/java/api/types/ModuleManifestRequires.java b/src/main/java/api/types/ModuleManifestRequires.java new file mode 100644 index 0000000..809a843 --- /dev/null +++ b/src/main/java/api/types/ModuleManifestRequires.java @@ -0,0 +1,116 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.cloudpdf.api.types; + +import com.cloudpdf.api.core.ObjectMappers; +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 java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = ModuleManifestRequires.Builder.class) +public final class ModuleManifestRequires { + private final List document; + + private final Map additionalProperties; + + private ModuleManifestRequires(List document, Map additionalProperties) { + this.document = document; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("document") + public List getDocument() { + return document; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof ModuleManifestRequires && equalTo((ModuleManifestRequires) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(ModuleManifestRequires other) { + return document.equals(other.document); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.document); + } + + @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 List document = new ArrayList<>(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + public Builder from(ModuleManifestRequires other) { + document(other.getDocument()); + return this; + } + + @JsonSetter(value = "document", nulls = Nulls.SKIP) + public Builder document(List document) { + this.document.clear(); + if (document != null) { + this.document.addAll(document); + } + return this; + } + + public Builder addDocument(String document) { + this.document.add(document); + return this; + } + + public Builder addAllDocument(List document) { + if (document != null) { + this.document.addAll(document); + } + return this; + } + + public ModuleManifestRequires build() { + return new ModuleManifestRequires(document, additionalProperties); + } + + public Builder additionalProperty(String key, Object value) { + this.additionalProperties.put(key, value); + return this; + } + + public Builder additionalProperties(Map additionalProperties) { + this.additionalProperties.putAll(additionalProperties); + return this; + } + } +} diff --git a/src/main/java/api/types/ModuleMeter.java b/src/main/java/api/types/ModuleMeter.java new file mode 100644 index 0000000..fcb85fd --- /dev/null +++ b/src/main/java/api/types/ModuleMeter.java @@ -0,0 +1,200 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.cloudpdf.api.types; + +import com.cloudpdf.api.core.ObjectMappers; +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 java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import org.jetbrains.annotations.NotNull; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = ModuleMeter.Builder.class) +public final class ModuleMeter { + private final String name; + + private final String label; + + private final String unit; + + private final Optional description; + + private final Map additionalProperties; + + private ModuleMeter( + String name, + String label, + String unit, + Optional description, + Map additionalProperties) { + this.name = name; + this.label = label; + this.unit = unit; + this.description = description; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("label") + public String getLabel() { + return label; + } + + @JsonProperty("unit") + public String getUnit() { + return unit; + } + + @JsonProperty("description") + public Optional getDescription() { + return description; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof ModuleMeter && equalTo((ModuleMeter) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(ModuleMeter other) { + return name.equals(other.name) + && label.equals(other.label) + && unit.equals(other.unit) + && description.equals(other.description); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.name, this.label, this.unit, this.description); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static NameStage builder() { + return new Builder(); + } + + public interface NameStage { + LabelStage name(@NotNull String name); + + Builder from(ModuleMeter other); + } + + public interface LabelStage { + UnitStage label(@NotNull String label); + } + + public interface UnitStage { + _FinalStage unit(@NotNull String unit); + } + + public interface _FinalStage { + ModuleMeter build(); + + _FinalStage additionalProperty(String key, Object value); + + _FinalStage additionalProperties(Map additionalProperties); + + _FinalStage description(Optional description); + + _FinalStage description(String description); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder implements NameStage, LabelStage, UnitStage, _FinalStage { + private String name; + + private String label; + + private String unit; + + private Optional description = Optional.empty(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(ModuleMeter other) { + name(other.getName()); + label(other.getLabel()); + unit(other.getUnit()); + description(other.getDescription()); + return this; + } + + @java.lang.Override + @JsonSetter("name") + public LabelStage name(@NotNull String name) { + this.name = Objects.requireNonNull(name, "name must not be null"); + return this; + } + + @java.lang.Override + @JsonSetter("label") + public UnitStage label(@NotNull String label) { + this.label = Objects.requireNonNull(label, "label must not be null"); + return this; + } + + @java.lang.Override + @JsonSetter("unit") + public _FinalStage unit(@NotNull String unit) { + this.unit = Objects.requireNonNull(unit, "unit must not be null"); + return this; + } + + @java.lang.Override + public _FinalStage description(String description) { + this.description = Optional.ofNullable(description); + return this; + } + + @java.lang.Override + @JsonSetter(value = "description", nulls = Nulls.SKIP) + public _FinalStage description(Optional description) { + this.description = description; + return this; + } + + @java.lang.Override + public ModuleMeter build() { + return new ModuleMeter(name, label, unit, description, additionalProperties); + } + + @java.lang.Override + public Builder additionalProperty(String key, Object value) { + this.additionalProperties.put(key, value); + return this; + } + + @java.lang.Override + public Builder additionalProperties(Map additionalProperties) { + this.additionalProperties.putAll(additionalProperties); + return this; + } + } +} diff --git a/src/main/java/api/types/ModulePermission.java b/src/main/java/api/types/ModulePermission.java new file mode 100644 index 0000000..1e457b8 --- /dev/null +++ b/src/main/java/api/types/ModulePermission.java @@ -0,0 +1,261 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.cloudpdf.api.types; + +import com.cloudpdf.api.core.ObjectMappers; +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 java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import org.jetbrains.annotations.NotNull; + +@JsonInclude(JsonInclude.Include.NON_ABSENT) +@JsonDeserialize(builder = ModulePermission.Builder.class) +public final class ModulePermission { + private final String name; + + private final ModulePermissionLevel level; + + private final String label; + + private final Optional description; + + private final Optional replaces; + + private final Optional> bypassedBy; + + private final Map additionalProperties; + + private ModulePermission( + String name, + ModulePermissionLevel level, + String label, + Optional description, + Optional replaces, + Optional> bypassedBy, + Map additionalProperties) { + this.name = name; + this.level = level; + this.label = label; + this.description = description; + this.replaces = replaces; + this.bypassedBy = bypassedBy; + this.additionalProperties = additionalProperties; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("level") + public ModulePermissionLevel getLevel() { + return level; + } + + @JsonProperty("label") + public String getLabel() { + return label; + } + + @JsonProperty("description") + public Optional getDescription() { + return description; + } + + @JsonProperty("replaces") + public Optional getReplaces() { + return replaces; + } + + @JsonProperty("bypassedBy") + public Optional> getBypassedBy() { + return bypassedBy; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof ModulePermission && equalTo((ModulePermission) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(ModulePermission other) { + return name.equals(other.name) + && level.equals(other.level) + && label.equals(other.label) + && description.equals(other.description) + && replaces.equals(other.replaces) + && bypassedBy.equals(other.bypassedBy); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.name, this.level, this.label, this.description, this.replaces, this.bypassedBy); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static NameStage builder() { + return new Builder(); + } + + public interface NameStage { + LevelStage name(@NotNull String name); + + Builder from(ModulePermission other); + } + + public interface LevelStage { + LabelStage level(@NotNull ModulePermissionLevel level); + } + + public interface LabelStage { + _FinalStage label(@NotNull String label); + } + + public interface _FinalStage { + ModulePermission build(); + + _FinalStage additionalProperty(String key, Object value); + + _FinalStage additionalProperties(Map additionalProperties); + + _FinalStage description(Optional description); + + _FinalStage description(String description); + + _FinalStage replaces(Optional replaces); + + _FinalStage replaces(String replaces); + + _FinalStage bypassedBy(Optional> bypassedBy); + + _FinalStage bypassedBy(List bypassedBy); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder implements NameStage, LevelStage, LabelStage, _FinalStage { + private String name; + + private ModulePermissionLevel level; + + private String label; + + private Optional> bypassedBy = Optional.empty(); + + private Optional replaces = Optional.empty(); + + private Optional description = Optional.empty(); + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(ModulePermission other) { + name(other.getName()); + level(other.getLevel()); + label(other.getLabel()); + description(other.getDescription()); + replaces(other.getReplaces()); + bypassedBy(other.getBypassedBy()); + return this; + } + + @java.lang.Override + @JsonSetter("name") + public LevelStage name(@NotNull String name) { + this.name = Objects.requireNonNull(name, "name must not be null"); + return this; + } + + @java.lang.Override + @JsonSetter("level") + public LabelStage level(@NotNull ModulePermissionLevel level) { + this.level = Objects.requireNonNull(level, "level must not be null"); + return this; + } + + @java.lang.Override + @JsonSetter("label") + public _FinalStage label(@NotNull String label) { + this.label = Objects.requireNonNull(label, "label must not be null"); + return this; + } + + @java.lang.Override + public _FinalStage bypassedBy(List bypassedBy) { + this.bypassedBy = Optional.ofNullable(bypassedBy); + return this; + } + + @java.lang.Override + @JsonSetter(value = "bypassedBy", nulls = Nulls.SKIP) + public _FinalStage bypassedBy(Optional> bypassedBy) { + this.bypassedBy = bypassedBy; + return this; + } + + @java.lang.Override + public _FinalStage replaces(String replaces) { + this.replaces = Optional.ofNullable(replaces); + return this; + } + + @java.lang.Override + @JsonSetter(value = "replaces", nulls = Nulls.SKIP) + public _FinalStage replaces(Optional replaces) { + this.replaces = replaces; + return this; + } + + @java.lang.Override + public _FinalStage description(String description) { + this.description = Optional.ofNullable(description); + return this; + } + + @java.lang.Override + @JsonSetter(value = "description", nulls = Nulls.SKIP) + public _FinalStage description(Optional description) { + this.description = description; + return this; + } + + @java.lang.Override + public ModulePermission build() { + return new ModulePermission(name, level, label, description, replaces, bypassedBy, additionalProperties); + } + + @java.lang.Override + public Builder additionalProperty(String key, Object value) { + this.additionalProperties.put(key, value); + return this; + } + + @java.lang.Override + public Builder additionalProperties(Map additionalProperties) { + this.additionalProperties.putAll(additionalProperties); + return this; + } + } +} diff --git a/src/main/java/api/types/ModulePermissionLevel.java b/src/main/java/api/types/ModulePermissionLevel.java new file mode 100644 index 0000000..612ebd7 --- /dev/null +++ b/src/main/java/api/types/ModulePermissionLevel.java @@ -0,0 +1,84 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.cloudpdf.api.types; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +public final class ModulePermissionLevel { + public static final ModulePermissionLevel DOCUMENT = new ModulePermissionLevel(Value.DOCUMENT, "document"); + + public static final ModulePermissionLevel TENANT = new ModulePermissionLevel(Value.TENANT, "tenant"); + + private final Value value; + + private final String string; + + ModulePermissionLevel(Value value, String string) { + this.value = value; + this.string = string; + } + + public Value getEnumValue() { + return value; + } + + @java.lang.Override + @JsonValue + public String toString() { + return this.string; + } + + @java.lang.Override + public boolean equals(Object other) { + return (this == other) + || (other instanceof ModulePermissionLevel + && this.string.equals(((ModulePermissionLevel) other).string)); + } + + @java.lang.Override + public int hashCode() { + return this.string.hashCode(); + } + + public T visit(Visitor visitor) { + switch (value) { + case DOCUMENT: + return visitor.visitDocument(); + case TENANT: + return visitor.visitTenant(); + case UNKNOWN: + default: + return visitor.visitUnknown(string); + } + } + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ModulePermissionLevel valueOf(String value) { + switch (value) { + case "document": + return DOCUMENT; + case "tenant": + return TENANT; + default: + return new ModulePermissionLevel(Value.UNKNOWN, value); + } + } + + public enum Value { + DOCUMENT, + + TENANT, + + UNKNOWN + } + + public interface Visitor { + T visitDocument(); + + T visitTenant(); + + T visitUnknown(String unknownType); + } +} diff --git a/src/main/java/api/types/AnnotationFreeTextRichText.java b/src/main/java/api/types/RichTextDocument.java similarity index 65% rename from src/main/java/api/types/AnnotationFreeTextRichText.java rename to src/main/java/api/types/RichTextDocument.java index bc3a202..d51d7de 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichText.java +++ b/src/main/java/api/types/RichTextDocument.java @@ -20,17 +20,17 @@ import org.jetbrains.annotations.NotNull; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationFreeTextRichText.Builder.class) -public final class AnnotationFreeTextRichText { - private final AnnotationFreeTextRichTextBody body; +@JsonDeserialize(builder = RichTextDocument.Builder.class) +public final class RichTextDocument { + private final RichTextDocumentBody body; - private final List paragraphs; + private final List paragraphs; private final Map additionalProperties; - private AnnotationFreeTextRichText( - AnnotationFreeTextRichTextBody body, - List paragraphs, + private RichTextDocument( + RichTextDocumentBody body, + List paragraphs, Map additionalProperties) { this.body = body; this.paragraphs = paragraphs; @@ -38,19 +38,19 @@ private AnnotationFreeTextRichText( } @JsonProperty("body") - public AnnotationFreeTextRichTextBody getBody() { + public RichTextDocumentBody getBody() { return body; } @JsonProperty("paragraphs") - public List getParagraphs() { + public List getParagraphs() { return paragraphs; } @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationFreeTextRichText && equalTo((AnnotationFreeTextRichText) other); + return other instanceof RichTextDocument && equalTo((RichTextDocument) other); } @JsonAnyGetter @@ -58,7 +58,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationFreeTextRichText other) { + private boolean equalTo(RichTextDocument other) { return body.equals(other.body) && paragraphs.equals(other.paragraphs); } @@ -77,30 +77,30 @@ public static BodyStage builder() { } public interface BodyStage { - _FinalStage body(@NotNull AnnotationFreeTextRichTextBody body); + _FinalStage body(@NotNull RichTextDocumentBody body); - Builder from(AnnotationFreeTextRichText other); + Builder from(RichTextDocument other); } public interface _FinalStage { - AnnotationFreeTextRichText build(); + RichTextDocument build(); _FinalStage additionalProperty(String key, Object value); _FinalStage additionalProperties(Map additionalProperties); - _FinalStage paragraphs(List paragraphs); + _FinalStage paragraphs(List paragraphs); - _FinalStage addParagraphs(AnnotationFreeTextRichTextParagraphsItem paragraphs); + _FinalStage addParagraphs(RichTextDocumentParagraphsItem paragraphs); - _FinalStage addAllParagraphs(List paragraphs); + _FinalStage addAllParagraphs(List paragraphs); } @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder implements BodyStage, _FinalStage { - private AnnotationFreeTextRichTextBody body; + private RichTextDocumentBody body; - private List paragraphs = new ArrayList<>(); + private List paragraphs = new ArrayList<>(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -108,7 +108,7 @@ public static final class Builder implements BodyStage, _FinalStage { private Builder() {} @java.lang.Override - public Builder from(AnnotationFreeTextRichText other) { + public Builder from(RichTextDocument other) { body(other.getBody()); paragraphs(other.getParagraphs()); return this; @@ -116,13 +116,13 @@ public Builder from(AnnotationFreeTextRichText other) { @java.lang.Override @JsonSetter("body") - public _FinalStage body(@NotNull AnnotationFreeTextRichTextBody body) { + public _FinalStage body(@NotNull RichTextDocumentBody body) { this.body = Objects.requireNonNull(body, "body must not be null"); return this; } @java.lang.Override - public _FinalStage addAllParagraphs(List paragraphs) { + public _FinalStage addAllParagraphs(List paragraphs) { if (paragraphs != null) { this.paragraphs.addAll(paragraphs); } @@ -130,14 +130,14 @@ public _FinalStage addAllParagraphs(List paragraphs) { + public _FinalStage paragraphs(List paragraphs) { this.paragraphs.clear(); if (paragraphs != null) { this.paragraphs.addAll(paragraphs); @@ -146,8 +146,8 @@ public _FinalStage paragraphs(List par } @java.lang.Override - public AnnotationFreeTextRichText build() { - return new AnnotationFreeTextRichText(body, paragraphs, additionalProperties); + public RichTextDocument build() { + return new RichTextDocument(body, paragraphs, additionalProperties); } @java.lang.Override diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextBody.java b/src/main/java/api/types/RichTextDocumentBody.java similarity index 79% rename from src/main/java/api/types/AnnotationFreeTextRichTextBody.java rename to src/main/java/api/types/RichTextDocumentBody.java index 54f641c..2bb1e35 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextBody.java +++ b/src/main/java/api/types/RichTextDocumentBody.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.NotNull; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationFreeTextRichTextBody.Builder.class) -public final class AnnotationFreeTextRichTextBody { +@JsonDeserialize(builder = RichTextDocumentBody.Builder.class) +public final class RichTextDocumentBody { private final String family; private final int weight; @@ -33,9 +33,9 @@ public final class AnnotationFreeTextRichTextBody { private final String color; - private final List decoration; + private final List decoration; - private final AnnotationFreeTextRichTextBodyScript script; + private final RichTextDocumentBodyScript script; private final double letterSpacing; @@ -43,33 +43,33 @@ public final class AnnotationFreeTextRichTextBody { private final Optional unknown; - private final AnnotationFreeTextRichTextBodyAlign align; + private final RichTextDocumentBodyAlign align; - private final AnnotationFreeTextRichTextBodyDir dir; + private final RichTextDocumentBodyDir dir; private final Optional lineHeight; - private final Optional margins; + private final Optional margins; private final Optional textIndent; private final Map additionalProperties; - private AnnotationFreeTextRichTextBody( + private RichTextDocumentBody( String family, int weight, boolean italic, double size, String color, - List decoration, - AnnotationFreeTextRichTextBodyScript script, + List decoration, + RichTextDocumentBodyScript script, double letterSpacing, double horizontalScale, Optional unknown, - AnnotationFreeTextRichTextBodyAlign align, - AnnotationFreeTextRichTextBodyDir dir, + RichTextDocumentBodyAlign align, + RichTextDocumentBodyDir dir, Optional lineHeight, - Optional margins, + Optional margins, Optional textIndent, Map additionalProperties) { this.family = family; @@ -116,12 +116,12 @@ public String getColor() { } @JsonProperty("decoration") - public List getDecoration() { + public List getDecoration() { return decoration; } @JsonProperty("script") - public AnnotationFreeTextRichTextBodyScript getScript() { + public RichTextDocumentBodyScript getScript() { return script; } @@ -141,12 +141,12 @@ public Optional getUnknown() { } @JsonProperty("align") - public AnnotationFreeTextRichTextBodyAlign getAlign() { + public RichTextDocumentBodyAlign getAlign() { return align; } @JsonProperty("dir") - public AnnotationFreeTextRichTextBodyDir getDir() { + public RichTextDocumentBodyDir getDir() { return dir; } @@ -156,7 +156,7 @@ public Optional getLineHeight() { } @JsonProperty("margins") - public Optional getMargins() { + public Optional getMargins() { return margins; } @@ -168,7 +168,7 @@ public Optional getTextIndent() { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationFreeTextRichTextBody && equalTo((AnnotationFreeTextRichTextBody) other); + return other instanceof RichTextDocumentBody && equalTo((RichTextDocumentBody) other); } @JsonAnyGetter @@ -176,7 +176,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationFreeTextRichTextBody other) { + private boolean equalTo(RichTextDocumentBody other) { return family.equals(other.family) && weight == other.weight && italic == other.italic @@ -226,7 +226,7 @@ public static FamilyStage builder() { public interface FamilyStage { WeightStage family(@NotNull String family); - Builder from(AnnotationFreeTextRichTextBody other); + Builder from(RichTextDocumentBody other); } public interface WeightStage { @@ -246,7 +246,7 @@ public interface ColorStage { } public interface ScriptStage { - LetterSpacingStage script(@NotNull AnnotationFreeTextRichTextBodyScript script); + LetterSpacingStage script(@NotNull RichTextDocumentBodyScript script); } public interface LetterSpacingStage { @@ -258,25 +258,25 @@ public interface HorizontalScaleStage { } public interface AlignStage { - DirStage align(@NotNull AnnotationFreeTextRichTextBodyAlign align); + DirStage align(@NotNull RichTextDocumentBodyAlign align); } public interface DirStage { - _FinalStage dir(@NotNull AnnotationFreeTextRichTextBodyDir dir); + _FinalStage dir(@NotNull RichTextDocumentBodyDir dir); } public interface _FinalStage { - AnnotationFreeTextRichTextBody build(); + RichTextDocumentBody build(); _FinalStage additionalProperty(String key, Object value); _FinalStage additionalProperties(Map additionalProperties); - _FinalStage decoration(List decoration); + _FinalStage decoration(List decoration); - _FinalStage addDecoration(AnnotationFreeTextRichTextBodyDecorationItem decoration); + _FinalStage addDecoration(RichTextDocumentBodyDecorationItem decoration); - _FinalStage addAllDecoration(List decoration); + _FinalStage addAllDecoration(List decoration); _FinalStage unknown(Optional unknown); @@ -286,9 +286,9 @@ public interface _FinalStage { _FinalStage lineHeight(Double lineHeight); - _FinalStage margins(Optional margins); + _FinalStage margins(Optional margins); - _FinalStage margins(AnnotationFreeTextRichTextBodyMargins margins); + _FinalStage margins(RichTextDocumentBodyMargins margins); _FinalStage textIndent(Optional textIndent); @@ -318,25 +318,25 @@ public static final class Builder private String color; - private AnnotationFreeTextRichTextBodyScript script; + private RichTextDocumentBodyScript script; private double letterSpacing; private double horizontalScale; - private AnnotationFreeTextRichTextBodyAlign align; + private RichTextDocumentBodyAlign align; - private AnnotationFreeTextRichTextBodyDir dir; + private RichTextDocumentBodyDir dir; private Optional textIndent = Optional.empty(); - private Optional margins = Optional.empty(); + private Optional margins = Optional.empty(); private Optional lineHeight = Optional.empty(); private Optional unknown = Optional.empty(); - private List decoration = new ArrayList<>(); + private List decoration = new ArrayList<>(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -344,7 +344,7 @@ public static final class Builder private Builder() {} @java.lang.Override - public Builder from(AnnotationFreeTextRichTextBody other) { + public Builder from(RichTextDocumentBody other) { family(other.getFamily()); weight(other.getWeight()); italic(other.getItalic()); @@ -400,7 +400,7 @@ public ScriptStage color(@NotNull String color) { @java.lang.Override @JsonSetter("script") - public LetterSpacingStage script(@NotNull AnnotationFreeTextRichTextBodyScript script) { + public LetterSpacingStage script(@NotNull RichTextDocumentBodyScript script) { this.script = Objects.requireNonNull(script, "script must not be null"); return this; } @@ -421,14 +421,14 @@ public AlignStage horizontalScale(double horizontalScale) { @java.lang.Override @JsonSetter("align") - public DirStage align(@NotNull AnnotationFreeTextRichTextBodyAlign align) { + public DirStage align(@NotNull RichTextDocumentBodyAlign align) { this.align = Objects.requireNonNull(align, "align must not be null"); return this; } @java.lang.Override @JsonSetter("dir") - public _FinalStage dir(@NotNull AnnotationFreeTextRichTextBodyDir dir) { + public _FinalStage dir(@NotNull RichTextDocumentBodyDir dir) { this.dir = Objects.requireNonNull(dir, "dir must not be null"); return this; } @@ -447,14 +447,14 @@ public _FinalStage textIndent(Optional textIndent) { } @java.lang.Override - public _FinalStage margins(AnnotationFreeTextRichTextBodyMargins margins) { + public _FinalStage margins(RichTextDocumentBodyMargins margins) { this.margins = Optional.ofNullable(margins); return this; } @java.lang.Override @JsonSetter(value = "margins", nulls = Nulls.SKIP) - public _FinalStage margins(Optional margins) { + public _FinalStage margins(Optional margins) { this.margins = margins; return this; } @@ -486,7 +486,7 @@ public _FinalStage unknown(Optional unknown) { } @java.lang.Override - public _FinalStage addAllDecoration(List decoration) { + public _FinalStage addAllDecoration(List decoration) { if (decoration != null) { this.decoration.addAll(decoration); } @@ -494,14 +494,14 @@ public _FinalStage addAllDecoration(List decoration) { + public _FinalStage decoration(List decoration) { this.decoration.clear(); if (decoration != null) { this.decoration.addAll(decoration); @@ -510,8 +510,8 @@ public _FinalStage decoration(List } @java.lang.Override - public AnnotationFreeTextRichTextBody build() { - return new AnnotationFreeTextRichTextBody( + public RichTextDocumentBody build() { + return new RichTextDocumentBody( family, weight, italic, diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyAlign.java b/src/main/java/api/types/RichTextDocumentBodyAlign.java similarity index 62% rename from src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyAlign.java rename to src/main/java/api/types/RichTextDocumentBodyAlign.java index d0ba36a..5e737d0 100644 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyAlign.java +++ b/src/main/java/api/types/RichTextDocumentBodyAlign.java @@ -6,24 +6,20 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationDraftFreeTextRichTextBodyAlign { - public static final AnnotationDraftFreeTextRichTextBodyAlign JUSTIFY = - new AnnotationDraftFreeTextRichTextBodyAlign(Value.JUSTIFY, "justify"); +public final class RichTextDocumentBodyAlign { + public static final RichTextDocumentBodyAlign JUSTIFY = new RichTextDocumentBodyAlign(Value.JUSTIFY, "justify"); - public static final AnnotationDraftFreeTextRichTextBodyAlign LEFT = - new AnnotationDraftFreeTextRichTextBodyAlign(Value.LEFT, "left"); + public static final RichTextDocumentBodyAlign LEFT = new RichTextDocumentBodyAlign(Value.LEFT, "left"); - public static final AnnotationDraftFreeTextRichTextBodyAlign RIGHT = - new AnnotationDraftFreeTextRichTextBodyAlign(Value.RIGHT, "right"); + public static final RichTextDocumentBodyAlign RIGHT = new RichTextDocumentBodyAlign(Value.RIGHT, "right"); - public static final AnnotationDraftFreeTextRichTextBodyAlign CENTER = - new AnnotationDraftFreeTextRichTextBodyAlign(Value.CENTER, "center"); + public static final RichTextDocumentBodyAlign CENTER = new RichTextDocumentBodyAlign(Value.CENTER, "center"); private final Value value; private final String string; - AnnotationDraftFreeTextRichTextBodyAlign(Value value, String string) { + RichTextDocumentBodyAlign(Value value, String string) { this.value = value; this.string = string; } @@ -41,8 +37,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationDraftFreeTextRichTextBodyAlign - && this.string.equals(((AnnotationDraftFreeTextRichTextBodyAlign) other).string)); + || (other instanceof RichTextDocumentBodyAlign + && this.string.equals(((RichTextDocumentBodyAlign) other).string)); } @java.lang.Override @@ -67,7 +63,7 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationDraftFreeTextRichTextBodyAlign valueOf(String value) { + public static RichTextDocumentBodyAlign valueOf(String value) { switch (value) { case "justify": return JUSTIFY; @@ -78,7 +74,7 @@ public static AnnotationDraftFreeTextRichTextBodyAlign valueOf(String value) { case "center": return CENTER; default: - return new AnnotationDraftFreeTextRichTextBodyAlign(Value.UNKNOWN, value); + return new RichTextDocumentBodyAlign(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextBodyDecorationItem.java b/src/main/java/api/types/RichTextDocumentBodyDecorationItem.java similarity index 62% rename from src/main/java/api/types/AnnotationFreeTextRichTextBodyDecorationItem.java rename to src/main/java/api/types/RichTextDocumentBodyDecorationItem.java index 9e6d38e..67adbf6 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextBodyDecorationItem.java +++ b/src/main/java/api/types/RichTextDocumentBodyDecorationItem.java @@ -6,21 +6,21 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationFreeTextRichTextBodyDecorationItem { - public static final AnnotationFreeTextRichTextBodyDecorationItem WORD = - new AnnotationFreeTextRichTextBodyDecorationItem(Value.WORD, "word"); +public final class RichTextDocumentBodyDecorationItem { + public static final RichTextDocumentBodyDecorationItem WORD = + new RichTextDocumentBodyDecorationItem(Value.WORD, "word"); - public static final AnnotationFreeTextRichTextBodyDecorationItem UNDERLINE = - new AnnotationFreeTextRichTextBodyDecorationItem(Value.UNDERLINE, "underline"); + public static final RichTextDocumentBodyDecorationItem UNDERLINE = + new RichTextDocumentBodyDecorationItem(Value.UNDERLINE, "underline"); - public static final AnnotationFreeTextRichTextBodyDecorationItem LINE_THROUGH = - new AnnotationFreeTextRichTextBodyDecorationItem(Value.LINE_THROUGH, "line-through"); + public static final RichTextDocumentBodyDecorationItem LINE_THROUGH = + new RichTextDocumentBodyDecorationItem(Value.LINE_THROUGH, "line-through"); private final Value value; private final String string; - AnnotationFreeTextRichTextBodyDecorationItem(Value value, String string) { + RichTextDocumentBodyDecorationItem(Value value, String string) { this.value = value; this.string = string; } @@ -38,8 +38,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationFreeTextRichTextBodyDecorationItem - && this.string.equals(((AnnotationFreeTextRichTextBodyDecorationItem) other).string)); + || (other instanceof RichTextDocumentBodyDecorationItem + && this.string.equals(((RichTextDocumentBodyDecorationItem) other).string)); } @java.lang.Override @@ -62,7 +62,7 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationFreeTextRichTextBodyDecorationItem valueOf(String value) { + public static RichTextDocumentBodyDecorationItem valueOf(String value) { switch (value) { case "word": return WORD; @@ -71,7 +71,7 @@ public static AnnotationFreeTextRichTextBodyDecorationItem valueOf(String value) case "line-through": return LINE_THROUGH; default: - return new AnnotationFreeTextRichTextBodyDecorationItem(Value.UNKNOWN, value); + return new RichTextDocumentBodyDecorationItem(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyDir.java b/src/main/java/api/types/RichTextDocumentBodyDir.java similarity index 65% rename from src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyDir.java rename to src/main/java/api/types/RichTextDocumentBodyDir.java index d38fe52..9cf3e27 100644 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyDir.java +++ b/src/main/java/api/types/RichTextDocumentBodyDir.java @@ -6,18 +6,16 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationPatchFreeTextRichTextBodyDir { - public static final AnnotationPatchFreeTextRichTextBodyDir LTR = - new AnnotationPatchFreeTextRichTextBodyDir(Value.LTR, "ltr"); +public final class RichTextDocumentBodyDir { + public static final RichTextDocumentBodyDir LTR = new RichTextDocumentBodyDir(Value.LTR, "ltr"); - public static final AnnotationPatchFreeTextRichTextBodyDir RTL = - new AnnotationPatchFreeTextRichTextBodyDir(Value.RTL, "rtl"); + public static final RichTextDocumentBodyDir RTL = new RichTextDocumentBodyDir(Value.RTL, "rtl"); private final Value value; private final String string; - AnnotationPatchFreeTextRichTextBodyDir(Value value, String string) { + RichTextDocumentBodyDir(Value value, String string) { this.value = value; this.string = string; } @@ -35,8 +33,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationPatchFreeTextRichTextBodyDir - && this.string.equals(((AnnotationPatchFreeTextRichTextBodyDir) other).string)); + || (other instanceof RichTextDocumentBodyDir + && this.string.equals(((RichTextDocumentBodyDir) other).string)); } @java.lang.Override @@ -57,14 +55,14 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationPatchFreeTextRichTextBodyDir valueOf(String value) { + public static RichTextDocumentBodyDir valueOf(String value) { switch (value) { case "ltr": return LTR; case "rtl": return RTL; default: - return new AnnotationPatchFreeTextRichTextBodyDir(Value.UNKNOWN, value); + return new RichTextDocumentBodyDir(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyMargins.java b/src/main/java/api/types/RichTextDocumentBodyMargins.java similarity index 84% rename from src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyMargins.java rename to src/main/java/api/types/RichTextDocumentBodyMargins.java index 9970f21..938fe23 100644 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyMargins.java +++ b/src/main/java/api/types/RichTextDocumentBodyMargins.java @@ -16,8 +16,8 @@ import java.util.Objects; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationPatchFreeTextRichTextBodyMargins.Builder.class) -public final class AnnotationPatchFreeTextRichTextBodyMargins { +@JsonDeserialize(builder = RichTextDocumentBodyMargins.Builder.class) +public final class RichTextDocumentBodyMargins { private final double top; private final double bottom; @@ -28,7 +28,7 @@ public final class AnnotationPatchFreeTextRichTextBodyMargins { private final Map additionalProperties; - private AnnotationPatchFreeTextRichTextBodyMargins( + private RichTextDocumentBodyMargins( double top, double bottom, double left, double right, Map additionalProperties) { this.top = top; this.bottom = bottom; @@ -60,8 +60,7 @@ public double getRight() { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationPatchFreeTextRichTextBodyMargins - && equalTo((AnnotationPatchFreeTextRichTextBodyMargins) other); + return other instanceof RichTextDocumentBodyMargins && equalTo((RichTextDocumentBodyMargins) other); } @JsonAnyGetter @@ -69,7 +68,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationPatchFreeTextRichTextBodyMargins other) { + private boolean equalTo(RichTextDocumentBodyMargins other) { return top == other.top && bottom == other.bottom && left == other.left && right == other.right; } @@ -90,7 +89,7 @@ public static TopStage builder() { public interface TopStage { BottomStage top(double top); - Builder from(AnnotationPatchFreeTextRichTextBodyMargins other); + Builder from(RichTextDocumentBodyMargins other); } public interface BottomStage { @@ -106,7 +105,7 @@ public interface RightStage { } public interface _FinalStage { - AnnotationPatchFreeTextRichTextBodyMargins build(); + RichTextDocumentBodyMargins build(); _FinalStage additionalProperty(String key, Object value); @@ -129,7 +128,7 @@ public static final class Builder implements TopStage, BottomStage, LeftStage, R private Builder() {} @java.lang.Override - public Builder from(AnnotationPatchFreeTextRichTextBodyMargins other) { + public Builder from(RichTextDocumentBodyMargins other) { top(other.getTop()); bottom(other.getBottom()); left(other.getLeft()); @@ -166,8 +165,8 @@ public _FinalStage right(double right) { } @java.lang.Override - public AnnotationPatchFreeTextRichTextBodyMargins build() { - return new AnnotationPatchFreeTextRichTextBodyMargins(top, bottom, left, right, additionalProperties); + public RichTextDocumentBodyMargins build() { + return new RichTextDocumentBodyMargins(top, bottom, left, right, additionalProperties); } @java.lang.Override diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextBodyScript.java b/src/main/java/api/types/RichTextDocumentBodyScript.java similarity index 64% rename from src/main/java/api/types/AnnotationFreeTextRichTextBodyScript.java rename to src/main/java/api/types/RichTextDocumentBodyScript.java index 5112db3..1704b56 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextBodyScript.java +++ b/src/main/java/api/types/RichTextDocumentBodyScript.java @@ -6,21 +6,18 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationFreeTextRichTextBodyScript { - public static final AnnotationFreeTextRichTextBodyScript SUB = - new AnnotationFreeTextRichTextBodyScript(Value.SUB, "sub"); +public final class RichTextDocumentBodyScript { + public static final RichTextDocumentBodyScript SUB = new RichTextDocumentBodyScript(Value.SUB, "sub"); - public static final AnnotationFreeTextRichTextBodyScript NORMAL = - new AnnotationFreeTextRichTextBodyScript(Value.NORMAL, "normal"); + public static final RichTextDocumentBodyScript NORMAL = new RichTextDocumentBodyScript(Value.NORMAL, "normal"); - public static final AnnotationFreeTextRichTextBodyScript SUPER = - new AnnotationFreeTextRichTextBodyScript(Value.SUPER, "super"); + public static final RichTextDocumentBodyScript SUPER = new RichTextDocumentBodyScript(Value.SUPER, "super"); private final Value value; private final String string; - AnnotationFreeTextRichTextBodyScript(Value value, String string) { + RichTextDocumentBodyScript(Value value, String string) { this.value = value; this.string = string; } @@ -38,8 +35,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationFreeTextRichTextBodyScript - && this.string.equals(((AnnotationFreeTextRichTextBodyScript) other).string)); + || (other instanceof RichTextDocumentBodyScript + && this.string.equals(((RichTextDocumentBodyScript) other).string)); } @java.lang.Override @@ -62,7 +59,7 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationFreeTextRichTextBodyScript valueOf(String value) { + public static RichTextDocumentBodyScript valueOf(String value) { switch (value) { case "sub": return SUB; @@ -71,7 +68,7 @@ public static AnnotationFreeTextRichTextBodyScript valueOf(String value) { case "super": return SUPER; default: - return new AnnotationFreeTextRichTextBodyScript(Value.UNKNOWN, value); + return new RichTextDocumentBodyScript(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichText.java b/src/main/java/api/types/RichTextDocumentInput.java similarity index 65% rename from src/main/java/api/types/AnnotationDraftFreeTextRichText.java rename to src/main/java/api/types/RichTextDocumentInput.java index 0a09f58..106b6e8 100644 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichText.java +++ b/src/main/java/api/types/RichTextDocumentInput.java @@ -20,17 +20,17 @@ import java.util.Optional; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationDraftFreeTextRichText.Builder.class) -public final class AnnotationDraftFreeTextRichText { - private final Optional body; +@JsonDeserialize(builder = RichTextDocumentInput.Builder.class) +public final class RichTextDocumentInput { + private final Optional body; - private final List paragraphs; + private final List paragraphs; private final Map additionalProperties; - private AnnotationDraftFreeTextRichText( - Optional body, - List paragraphs, + private RichTextDocumentInput( + Optional body, + List paragraphs, Map additionalProperties) { this.body = body; this.paragraphs = paragraphs; @@ -38,19 +38,19 @@ private AnnotationDraftFreeTextRichText( } @JsonProperty("body") - public Optional getBody() { + public Optional getBody() { return body; } @JsonProperty("paragraphs") - public List getParagraphs() { + public List getParagraphs() { return paragraphs; } @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationDraftFreeTextRichText && equalTo((AnnotationDraftFreeTextRichText) other); + return other instanceof RichTextDocumentInput && equalTo((RichTextDocumentInput) other); } @JsonAnyGetter @@ -58,7 +58,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationDraftFreeTextRichText other) { + private boolean equalTo(RichTextDocumentInput other) { return body.equals(other.body) && paragraphs.equals(other.paragraphs); } @@ -78,34 +78,34 @@ public static Builder builder() { @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder { - private Optional body = Optional.empty(); + private Optional body = Optional.empty(); - private List paragraphs = new ArrayList<>(); + private List paragraphs = new ArrayList<>(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); private Builder() {} - public Builder from(AnnotationDraftFreeTextRichText other) { + public Builder from(RichTextDocumentInput other) { body(other.getBody()); paragraphs(other.getParagraphs()); return this; } @JsonSetter(value = "body", nulls = Nulls.SKIP) - public Builder body(Optional body) { + public Builder body(Optional body) { this.body = body; return this; } - public Builder body(AnnotationDraftFreeTextRichTextBody body) { + public Builder body(RichTextDocumentInputBody body) { this.body = Optional.ofNullable(body); return this; } @JsonSetter(value = "paragraphs", nulls = Nulls.SKIP) - public Builder paragraphs(List paragraphs) { + public Builder paragraphs(List paragraphs) { this.paragraphs.clear(); if (paragraphs != null) { this.paragraphs.addAll(paragraphs); @@ -113,20 +113,20 @@ public Builder paragraphs(List pa return this; } - public Builder addParagraphs(AnnotationDraftFreeTextRichTextParagraphsItem paragraphs) { + public Builder addParagraphs(RichTextDocumentInputParagraphsItem paragraphs) { this.paragraphs.add(paragraphs); return this; } - public Builder addAllParagraphs(List paragraphs) { + public Builder addAllParagraphs(List paragraphs) { if (paragraphs != null) { this.paragraphs.addAll(paragraphs); } return this; } - public AnnotationDraftFreeTextRichText build() { - return new AnnotationDraftFreeTextRichText(body, paragraphs, additionalProperties); + public RichTextDocumentInput build() { + return new RichTextDocumentInput(body, paragraphs, additionalProperties); } public Builder additionalProperty(String key, Object value) { diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextBody.java b/src/main/java/api/types/RichTextDocumentInputBody.java similarity index 79% rename from src/main/java/api/types/AnnotationDraftFreeTextRichTextBody.java rename to src/main/java/api/types/RichTextDocumentInputBody.java index 3cae076..ec9cb4e 100644 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextBody.java +++ b/src/main/java/api/types/RichTextDocumentInputBody.java @@ -19,8 +19,8 @@ import java.util.Optional; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationDraftFreeTextRichTextBody.Builder.class) -public final class AnnotationDraftFreeTextRichTextBody { +@JsonDeserialize(builder = RichTextDocumentInputBody.Builder.class) +public final class RichTextDocumentInputBody { private final Optional family; private final Optional weight; @@ -31,9 +31,9 @@ public final class AnnotationDraftFreeTextRichTextBody { private final Optional color; - private final Optional> decoration; + private final Optional> decoration; - private final Optional script; + private final Optional script; private final Optional letterSpacing; @@ -41,33 +41,33 @@ public final class AnnotationDraftFreeTextRichTextBody { private final Optional unknown; - private final Optional align; + private final Optional align; - private final Optional dir; + private final Optional dir; private final Optional lineHeight; - private final Optional margins; + private final Optional margins; private final Optional textIndent; private final Map additionalProperties; - private AnnotationDraftFreeTextRichTextBody( + private RichTextDocumentInputBody( Optional family, Optional weight, Optional italic, Optional size, Optional color, - Optional> decoration, - Optional script, + Optional> decoration, + Optional script, Optional letterSpacing, Optional horizontalScale, Optional unknown, - Optional align, - Optional dir, + Optional align, + Optional dir, Optional lineHeight, - Optional margins, + Optional margins, Optional textIndent, Map additionalProperties) { this.family = family; @@ -114,12 +114,12 @@ public Optional getColor() { } @JsonProperty("decoration") - public Optional> getDecoration() { + public Optional> getDecoration() { return decoration; } @JsonProperty("script") - public Optional getScript() { + public Optional getScript() { return script; } @@ -139,12 +139,12 @@ public Optional getUnknown() { } @JsonProperty("align") - public Optional getAlign() { + public Optional getAlign() { return align; } @JsonProperty("dir") - public Optional getDir() { + public Optional getDir() { return dir; } @@ -154,7 +154,7 @@ public Optional getLineHeight() { } @JsonProperty("margins") - public Optional getMargins() { + public Optional getMargins() { return margins; } @@ -166,8 +166,7 @@ public Optional getTextIndent() { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationDraftFreeTextRichTextBody - && equalTo((AnnotationDraftFreeTextRichTextBody) other); + return other instanceof RichTextDocumentInputBody && equalTo((RichTextDocumentInputBody) other); } @JsonAnyGetter @@ -175,7 +174,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationDraftFreeTextRichTextBody other) { + private boolean equalTo(RichTextDocumentInputBody other) { return family.equals(other.family) && weight.equals(other.weight) && italic.equals(other.italic) @@ -234,9 +233,9 @@ public static final class Builder { private Optional color = Optional.empty(); - private Optional> decoration = Optional.empty(); + private Optional> decoration = Optional.empty(); - private Optional script = Optional.empty(); + private Optional script = Optional.empty(); private Optional letterSpacing = Optional.empty(); @@ -244,13 +243,13 @@ public static final class Builder { private Optional unknown = Optional.empty(); - private Optional align = Optional.empty(); + private Optional align = Optional.empty(); - private Optional dir = Optional.empty(); + private Optional dir = Optional.empty(); private Optional lineHeight = Optional.empty(); - private Optional margins = Optional.empty(); + private Optional margins = Optional.empty(); private Optional textIndent = Optional.empty(); @@ -259,7 +258,7 @@ public static final class Builder { private Builder() {} - public Builder from(AnnotationDraftFreeTextRichTextBody other) { + public Builder from(RichTextDocumentInputBody other) { family(other.getFamily()); weight(other.getWeight()); italic(other.getItalic()); @@ -334,23 +333,23 @@ public Builder color(String color) { } @JsonSetter(value = "decoration", nulls = Nulls.SKIP) - public Builder decoration(Optional> decoration) { + public Builder decoration(Optional> decoration) { this.decoration = decoration; return this; } - public Builder decoration(List decoration) { + public Builder decoration(List decoration) { this.decoration = Optional.ofNullable(decoration); return this; } @JsonSetter(value = "script", nulls = Nulls.SKIP) - public Builder script(Optional script) { + public Builder script(Optional script) { this.script = script; return this; } - public Builder script(AnnotationDraftFreeTextRichTextBodyScript script) { + public Builder script(RichTextDocumentInputBodyScript script) { this.script = Optional.ofNullable(script); return this; } @@ -389,23 +388,23 @@ public Builder unknown(String unknown) { } @JsonSetter(value = "align", nulls = Nulls.SKIP) - public Builder align(Optional align) { + public Builder align(Optional align) { this.align = align; return this; } - public Builder align(AnnotationDraftFreeTextRichTextBodyAlign align) { + public Builder align(RichTextDocumentInputBodyAlign align) { this.align = Optional.ofNullable(align); return this; } @JsonSetter(value = "dir", nulls = Nulls.SKIP) - public Builder dir(Optional dir) { + public Builder dir(Optional dir) { this.dir = dir; return this; } - public Builder dir(AnnotationDraftFreeTextRichTextBodyDir dir) { + public Builder dir(RichTextDocumentInputBodyDir dir) { this.dir = Optional.ofNullable(dir); return this; } @@ -422,12 +421,12 @@ public Builder lineHeight(Double lineHeight) { } @JsonSetter(value = "margins", nulls = Nulls.SKIP) - public Builder margins(Optional margins) { + public Builder margins(Optional margins) { this.margins = margins; return this; } - public Builder margins(AnnotationDraftFreeTextRichTextBodyMargins margins) { + public Builder margins(RichTextDocumentInputBodyMargins margins) { this.margins = Optional.ofNullable(margins); return this; } @@ -443,8 +442,8 @@ public Builder textIndent(Double textIndent) { return this; } - public AnnotationDraftFreeTextRichTextBody build() { - return new AnnotationDraftFreeTextRichTextBody( + public RichTextDocumentInputBody build() { + return new RichTextDocumentInputBody( family, weight, italic, diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemAlign.java b/src/main/java/api/types/RichTextDocumentInputBodyAlign.java similarity index 60% rename from src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemAlign.java rename to src/main/java/api/types/RichTextDocumentInputBodyAlign.java index 321c65f..696da16 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemAlign.java +++ b/src/main/java/api/types/RichTextDocumentInputBodyAlign.java @@ -6,24 +6,22 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationFreeTextRichTextParagraphsItemAlign { - public static final AnnotationFreeTextRichTextParagraphsItemAlign JUSTIFY = - new AnnotationFreeTextRichTextParagraphsItemAlign(Value.JUSTIFY, "justify"); +public final class RichTextDocumentInputBodyAlign { + public static final RichTextDocumentInputBodyAlign JUSTIFY = + new RichTextDocumentInputBodyAlign(Value.JUSTIFY, "justify"); - public static final AnnotationFreeTextRichTextParagraphsItemAlign LEFT = - new AnnotationFreeTextRichTextParagraphsItemAlign(Value.LEFT, "left"); + public static final RichTextDocumentInputBodyAlign LEFT = new RichTextDocumentInputBodyAlign(Value.LEFT, "left"); - public static final AnnotationFreeTextRichTextParagraphsItemAlign RIGHT = - new AnnotationFreeTextRichTextParagraphsItemAlign(Value.RIGHT, "right"); + public static final RichTextDocumentInputBodyAlign RIGHT = new RichTextDocumentInputBodyAlign(Value.RIGHT, "right"); - public static final AnnotationFreeTextRichTextParagraphsItemAlign CENTER = - new AnnotationFreeTextRichTextParagraphsItemAlign(Value.CENTER, "center"); + public static final RichTextDocumentInputBodyAlign CENTER = + new RichTextDocumentInputBodyAlign(Value.CENTER, "center"); private final Value value; private final String string; - AnnotationFreeTextRichTextParagraphsItemAlign(Value value, String string) { + RichTextDocumentInputBodyAlign(Value value, String string) { this.value = value; this.string = string; } @@ -41,8 +39,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationFreeTextRichTextParagraphsItemAlign - && this.string.equals(((AnnotationFreeTextRichTextParagraphsItemAlign) other).string)); + || (other instanceof RichTextDocumentInputBodyAlign + && this.string.equals(((RichTextDocumentInputBodyAlign) other).string)); } @java.lang.Override @@ -67,7 +65,7 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationFreeTextRichTextParagraphsItemAlign valueOf(String value) { + public static RichTextDocumentInputBodyAlign valueOf(String value) { switch (value) { case "justify": return JUSTIFY; @@ -78,7 +76,7 @@ public static AnnotationFreeTextRichTextParagraphsItemAlign valueOf(String value case "center": return CENTER; default: - return new AnnotationFreeTextRichTextParagraphsItemAlign(Value.UNKNOWN, value); + return new RichTextDocumentInputBodyAlign(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyDecorationItem.java b/src/main/java/api/types/RichTextDocumentInputBodyDecorationItem.java similarity index 60% rename from src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyDecorationItem.java rename to src/main/java/api/types/RichTextDocumentInputBodyDecorationItem.java index abbba93..d6a8fc6 100644 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyDecorationItem.java +++ b/src/main/java/api/types/RichTextDocumentInputBodyDecorationItem.java @@ -6,21 +6,21 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationPatchFreeTextRichTextBodyDecorationItem { - public static final AnnotationPatchFreeTextRichTextBodyDecorationItem WORD = - new AnnotationPatchFreeTextRichTextBodyDecorationItem(Value.WORD, "word"); +public final class RichTextDocumentInputBodyDecorationItem { + public static final RichTextDocumentInputBodyDecorationItem WORD = + new RichTextDocumentInputBodyDecorationItem(Value.WORD, "word"); - public static final AnnotationPatchFreeTextRichTextBodyDecorationItem UNDERLINE = - new AnnotationPatchFreeTextRichTextBodyDecorationItem(Value.UNDERLINE, "underline"); + public static final RichTextDocumentInputBodyDecorationItem UNDERLINE = + new RichTextDocumentInputBodyDecorationItem(Value.UNDERLINE, "underline"); - public static final AnnotationPatchFreeTextRichTextBodyDecorationItem LINE_THROUGH = - new AnnotationPatchFreeTextRichTextBodyDecorationItem(Value.LINE_THROUGH, "line-through"); + public static final RichTextDocumentInputBodyDecorationItem LINE_THROUGH = + new RichTextDocumentInputBodyDecorationItem(Value.LINE_THROUGH, "line-through"); private final Value value; private final String string; - AnnotationPatchFreeTextRichTextBodyDecorationItem(Value value, String string) { + RichTextDocumentInputBodyDecorationItem(Value value, String string) { this.value = value; this.string = string; } @@ -38,8 +38,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationPatchFreeTextRichTextBodyDecorationItem - && this.string.equals(((AnnotationPatchFreeTextRichTextBodyDecorationItem) other).string)); + || (other instanceof RichTextDocumentInputBodyDecorationItem + && this.string.equals(((RichTextDocumentInputBodyDecorationItem) other).string)); } @java.lang.Override @@ -62,7 +62,7 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationPatchFreeTextRichTextBodyDecorationItem valueOf(String value) { + public static RichTextDocumentInputBodyDecorationItem valueOf(String value) { switch (value) { case "word": return WORD; @@ -71,7 +71,7 @@ public static AnnotationPatchFreeTextRichTextBodyDecorationItem valueOf(String v case "line-through": return LINE_THROUGH; default: - return new AnnotationPatchFreeTextRichTextBodyDecorationItem(Value.UNKNOWN, value); + return new RichTextDocumentInputBodyDecorationItem(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemDir.java b/src/main/java/api/types/RichTextDocumentInputBodyDir.java similarity index 64% rename from src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemDir.java rename to src/main/java/api/types/RichTextDocumentInputBodyDir.java index 0e3729a..80f7328 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemDir.java +++ b/src/main/java/api/types/RichTextDocumentInputBodyDir.java @@ -6,18 +6,16 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationFreeTextRichTextParagraphsItemDir { - public static final AnnotationFreeTextRichTextParagraphsItemDir LTR = - new AnnotationFreeTextRichTextParagraphsItemDir(Value.LTR, "ltr"); +public final class RichTextDocumentInputBodyDir { + public static final RichTextDocumentInputBodyDir LTR = new RichTextDocumentInputBodyDir(Value.LTR, "ltr"); - public static final AnnotationFreeTextRichTextParagraphsItemDir RTL = - new AnnotationFreeTextRichTextParagraphsItemDir(Value.RTL, "rtl"); + public static final RichTextDocumentInputBodyDir RTL = new RichTextDocumentInputBodyDir(Value.RTL, "rtl"); private final Value value; private final String string; - AnnotationFreeTextRichTextParagraphsItemDir(Value value, String string) { + RichTextDocumentInputBodyDir(Value value, String string) { this.value = value; this.string = string; } @@ -35,8 +33,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationFreeTextRichTextParagraphsItemDir - && this.string.equals(((AnnotationFreeTextRichTextParagraphsItemDir) other).string)); + || (other instanceof RichTextDocumentInputBodyDir + && this.string.equals(((RichTextDocumentInputBodyDir) other).string)); } @java.lang.Override @@ -57,14 +55,14 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationFreeTextRichTextParagraphsItemDir valueOf(String value) { + public static RichTextDocumentInputBodyDir valueOf(String value) { switch (value) { case "ltr": return LTR; case "rtl": return RTL; default: - return new AnnotationFreeTextRichTextParagraphsItemDir(Value.UNKNOWN, value); + return new RichTextDocumentInputBodyDir(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemMargins.java b/src/main/java/api/types/RichTextDocumentInputBodyMargins.java similarity index 83% rename from src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemMargins.java rename to src/main/java/api/types/RichTextDocumentInputBodyMargins.java index 9dc3f2c..f763fdb 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemMargins.java +++ b/src/main/java/api/types/RichTextDocumentInputBodyMargins.java @@ -16,8 +16,8 @@ import java.util.Objects; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationFreeTextRichTextParagraphsItemMargins.Builder.class) -public final class AnnotationFreeTextRichTextParagraphsItemMargins { +@JsonDeserialize(builder = RichTextDocumentInputBodyMargins.Builder.class) +public final class RichTextDocumentInputBodyMargins { private final double top; private final double bottom; @@ -28,7 +28,7 @@ public final class AnnotationFreeTextRichTextParagraphsItemMargins { private final Map additionalProperties; - private AnnotationFreeTextRichTextParagraphsItemMargins( + private RichTextDocumentInputBodyMargins( double top, double bottom, double left, double right, Map additionalProperties) { this.top = top; this.bottom = bottom; @@ -60,8 +60,7 @@ public double getRight() { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationFreeTextRichTextParagraphsItemMargins - && equalTo((AnnotationFreeTextRichTextParagraphsItemMargins) other); + return other instanceof RichTextDocumentInputBodyMargins && equalTo((RichTextDocumentInputBodyMargins) other); } @JsonAnyGetter @@ -69,7 +68,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationFreeTextRichTextParagraphsItemMargins other) { + private boolean equalTo(RichTextDocumentInputBodyMargins other) { return top == other.top && bottom == other.bottom && left == other.left && right == other.right; } @@ -90,7 +89,7 @@ public static TopStage builder() { public interface TopStage { BottomStage top(double top); - Builder from(AnnotationFreeTextRichTextParagraphsItemMargins other); + Builder from(RichTextDocumentInputBodyMargins other); } public interface BottomStage { @@ -106,7 +105,7 @@ public interface RightStage { } public interface _FinalStage { - AnnotationFreeTextRichTextParagraphsItemMargins build(); + RichTextDocumentInputBodyMargins build(); _FinalStage additionalProperty(String key, Object value); @@ -129,7 +128,7 @@ public static final class Builder implements TopStage, BottomStage, LeftStage, R private Builder() {} @java.lang.Override - public Builder from(AnnotationFreeTextRichTextParagraphsItemMargins other) { + public Builder from(RichTextDocumentInputBodyMargins other) { top(other.getTop()); bottom(other.getBottom()); left(other.getLeft()); @@ -166,8 +165,8 @@ public _FinalStage right(double right) { } @java.lang.Override - public AnnotationFreeTextRichTextParagraphsItemMargins build() { - return new AnnotationFreeTextRichTextParagraphsItemMargins(top, bottom, left, right, additionalProperties); + public RichTextDocumentInputBodyMargins build() { + return new RichTextDocumentInputBodyMargins(top, bottom, left, right, additionalProperties); } @java.lang.Override diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyScript.java b/src/main/java/api/types/RichTextDocumentInputBodyScript.java similarity index 63% rename from src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyScript.java rename to src/main/java/api/types/RichTextDocumentInputBodyScript.java index 8055e6f..4f4e853 100644 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyScript.java +++ b/src/main/java/api/types/RichTextDocumentInputBodyScript.java @@ -6,21 +6,20 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationDraftFreeTextRichTextBodyScript { - public static final AnnotationDraftFreeTextRichTextBodyScript SUB = - new AnnotationDraftFreeTextRichTextBodyScript(Value.SUB, "sub"); +public final class RichTextDocumentInputBodyScript { + public static final RichTextDocumentInputBodyScript SUB = new RichTextDocumentInputBodyScript(Value.SUB, "sub"); - public static final AnnotationDraftFreeTextRichTextBodyScript NORMAL = - new AnnotationDraftFreeTextRichTextBodyScript(Value.NORMAL, "normal"); + public static final RichTextDocumentInputBodyScript NORMAL = + new RichTextDocumentInputBodyScript(Value.NORMAL, "normal"); - public static final AnnotationDraftFreeTextRichTextBodyScript SUPER = - new AnnotationDraftFreeTextRichTextBodyScript(Value.SUPER, "super"); + public static final RichTextDocumentInputBodyScript SUPER = + new RichTextDocumentInputBodyScript(Value.SUPER, "super"); private final Value value; private final String string; - AnnotationDraftFreeTextRichTextBodyScript(Value value, String string) { + RichTextDocumentInputBodyScript(Value value, String string) { this.value = value; this.string = string; } @@ -38,8 +37,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationDraftFreeTextRichTextBodyScript - && this.string.equals(((AnnotationDraftFreeTextRichTextBodyScript) other).string)); + || (other instanceof RichTextDocumentInputBodyScript + && this.string.equals(((RichTextDocumentInputBodyScript) other).string)); } @java.lang.Override @@ -62,7 +61,7 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationDraftFreeTextRichTextBodyScript valueOf(String value) { + public static RichTextDocumentInputBodyScript valueOf(String value) { switch (value) { case "sub": return SUB; @@ -71,7 +70,7 @@ public static AnnotationDraftFreeTextRichTextBodyScript valueOf(String value) { case "super": return SUPER; default: - return new AnnotationDraftFreeTextRichTextBodyScript(Value.UNKNOWN, value); + return new RichTextDocumentInputBodyScript(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItem.java b/src/main/java/api/types/RichTextDocumentInputParagraphsItem.java similarity index 69% rename from src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItem.java rename to src/main/java/api/types/RichTextDocumentInputParagraphsItem.java index 524fde6..723e407 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItem.java +++ b/src/main/java/api/types/RichTextDocumentInputParagraphsItem.java @@ -20,32 +20,32 @@ import java.util.Optional; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationFreeTextRichTextParagraphsItem.Builder.class) -public final class AnnotationFreeTextRichTextParagraphsItem { - private final Optional align; +@JsonDeserialize(builder = RichTextDocumentInputParagraphsItem.Builder.class) +public final class RichTextDocumentInputParagraphsItem { + private final Optional align; - private final Optional dir; + private final Optional dir; private final Optional lineHeight; - private final Optional margins; + private final Optional margins; private final Optional textIndent; private final Optional unknown; - private final List runs; + private final List runs; private final Map additionalProperties; - private AnnotationFreeTextRichTextParagraphsItem( - Optional align, - Optional dir, + private RichTextDocumentInputParagraphsItem( + Optional align, + Optional dir, Optional lineHeight, - Optional margins, + Optional margins, Optional textIndent, Optional unknown, - List runs, + List runs, Map additionalProperties) { this.align = align; this.dir = dir; @@ -58,12 +58,12 @@ private AnnotationFreeTextRichTextParagraphsItem( } @JsonProperty("align") - public Optional getAlign() { + public Optional getAlign() { return align; } @JsonProperty("dir") - public Optional getDir() { + public Optional getDir() { return dir; } @@ -73,7 +73,7 @@ public Optional getLineHeight() { } @JsonProperty("margins") - public Optional getMargins() { + public Optional getMargins() { return margins; } @@ -88,15 +88,15 @@ public Optional getUnknown() { } @JsonProperty("runs") - public List getRuns() { + public List getRuns() { return runs; } @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationFreeTextRichTextParagraphsItem - && equalTo((AnnotationFreeTextRichTextParagraphsItem) other); + return other instanceof RichTextDocumentInputParagraphsItem + && equalTo((RichTextDocumentInputParagraphsItem) other); } @JsonAnyGetter @@ -104,7 +104,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationFreeTextRichTextParagraphsItem other) { + private boolean equalTo(RichTextDocumentInputParagraphsItem other) { return align.equals(other.align) && dir.equals(other.dir) && lineHeight.equals(other.lineHeight) @@ -131,26 +131,26 @@ public static Builder builder() { @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder { - private Optional align = Optional.empty(); + private Optional align = Optional.empty(); - private Optional dir = Optional.empty(); + private Optional dir = Optional.empty(); private Optional lineHeight = Optional.empty(); - private Optional margins = Optional.empty(); + private Optional margins = Optional.empty(); private Optional textIndent = Optional.empty(); private Optional unknown = Optional.empty(); - private List runs = new ArrayList<>(); + private List runs = new ArrayList<>(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); private Builder() {} - public Builder from(AnnotationFreeTextRichTextParagraphsItem other) { + public Builder from(RichTextDocumentInputParagraphsItem other) { align(other.getAlign()); dir(other.getDir()); lineHeight(other.getLineHeight()); @@ -162,23 +162,23 @@ public Builder from(AnnotationFreeTextRichTextParagraphsItem other) { } @JsonSetter(value = "align", nulls = Nulls.SKIP) - public Builder align(Optional align) { + public Builder align(Optional align) { this.align = align; return this; } - public Builder align(AnnotationFreeTextRichTextParagraphsItemAlign align) { + public Builder align(RichTextDocumentInputParagraphsItemAlign align) { this.align = Optional.ofNullable(align); return this; } @JsonSetter(value = "dir", nulls = Nulls.SKIP) - public Builder dir(Optional dir) { + public Builder dir(Optional dir) { this.dir = dir; return this; } - public Builder dir(AnnotationFreeTextRichTextParagraphsItemDir dir) { + public Builder dir(RichTextDocumentInputParagraphsItemDir dir) { this.dir = Optional.ofNullable(dir); return this; } @@ -195,12 +195,12 @@ public Builder lineHeight(Double lineHeight) { } @JsonSetter(value = "margins", nulls = Nulls.SKIP) - public Builder margins(Optional margins) { + public Builder margins(Optional margins) { this.margins = margins; return this; } - public Builder margins(AnnotationFreeTextRichTextParagraphsItemMargins margins) { + public Builder margins(RichTextDocumentInputParagraphsItemMargins margins) { this.margins = Optional.ofNullable(margins); return this; } @@ -228,7 +228,7 @@ public Builder unknown(String unknown) { } @JsonSetter(value = "runs", nulls = Nulls.SKIP) - public Builder runs(List runs) { + public Builder runs(List runs) { this.runs.clear(); if (runs != null) { this.runs.addAll(runs); @@ -236,20 +236,20 @@ public Builder runs(List runs) return this; } - public Builder addRuns(AnnotationFreeTextRichTextParagraphsItemRunsItem runs) { + public Builder addRuns(RichTextDocumentInputParagraphsItemRunsItem runs) { this.runs.add(runs); return this; } - public Builder addAllRuns(List runs) { + public Builder addAllRuns(List runs) { if (runs != null) { this.runs.addAll(runs); } return this; } - public AnnotationFreeTextRichTextParagraphsItem build() { - return new AnnotationFreeTextRichTextParagraphsItem( + public RichTextDocumentInputParagraphsItem build() { + return new RichTextDocumentInputParagraphsItem( align, dir, lineHeight, margins, textIndent, unknown, runs, additionalProperties); } diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyAlign.java b/src/main/java/api/types/RichTextDocumentInputParagraphsItemAlign.java similarity index 67% rename from src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyAlign.java rename to src/main/java/api/types/RichTextDocumentInputParagraphsItemAlign.java index e2c4ea6..147b5f6 100644 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyAlign.java +++ b/src/main/java/api/types/RichTextDocumentInputParagraphsItemAlign.java @@ -6,24 +6,24 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationPatchFreeTextRichTextBodyAlign { - public static final AnnotationPatchFreeTextRichTextBodyAlign JUSTIFY = - new AnnotationPatchFreeTextRichTextBodyAlign(Value.JUSTIFY, "justify"); +public final class RichTextDocumentInputParagraphsItemAlign { + public static final RichTextDocumentInputParagraphsItemAlign JUSTIFY = + new RichTextDocumentInputParagraphsItemAlign(Value.JUSTIFY, "justify"); - public static final AnnotationPatchFreeTextRichTextBodyAlign LEFT = - new AnnotationPatchFreeTextRichTextBodyAlign(Value.LEFT, "left"); + public static final RichTextDocumentInputParagraphsItemAlign LEFT = + new RichTextDocumentInputParagraphsItemAlign(Value.LEFT, "left"); - public static final AnnotationPatchFreeTextRichTextBodyAlign RIGHT = - new AnnotationPatchFreeTextRichTextBodyAlign(Value.RIGHT, "right"); + public static final RichTextDocumentInputParagraphsItemAlign RIGHT = + new RichTextDocumentInputParagraphsItemAlign(Value.RIGHT, "right"); - public static final AnnotationPatchFreeTextRichTextBodyAlign CENTER = - new AnnotationPatchFreeTextRichTextBodyAlign(Value.CENTER, "center"); + public static final RichTextDocumentInputParagraphsItemAlign CENTER = + new RichTextDocumentInputParagraphsItemAlign(Value.CENTER, "center"); private final Value value; private final String string; - AnnotationPatchFreeTextRichTextBodyAlign(Value value, String string) { + RichTextDocumentInputParagraphsItemAlign(Value value, String string) { this.value = value; this.string = string; } @@ -41,8 +41,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationPatchFreeTextRichTextBodyAlign - && this.string.equals(((AnnotationPatchFreeTextRichTextBodyAlign) other).string)); + || (other instanceof RichTextDocumentInputParagraphsItemAlign + && this.string.equals(((RichTextDocumentInputParagraphsItemAlign) other).string)); } @java.lang.Override @@ -67,7 +67,7 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationPatchFreeTextRichTextBodyAlign valueOf(String value) { + public static RichTextDocumentInputParagraphsItemAlign valueOf(String value) { switch (value) { case "justify": return JUSTIFY; @@ -78,7 +78,7 @@ public static AnnotationPatchFreeTextRichTextBodyAlign valueOf(String value) { case "center": return CENTER; default: - return new AnnotationPatchFreeTextRichTextBodyAlign(Value.UNKNOWN, value); + return new RichTextDocumentInputParagraphsItemAlign(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyDir.java b/src/main/java/api/types/RichTextDocumentInputParagraphsItemDir.java similarity index 69% rename from src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyDir.java rename to src/main/java/api/types/RichTextDocumentInputParagraphsItemDir.java index 27f4f5d..05e6c6a 100644 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyDir.java +++ b/src/main/java/api/types/RichTextDocumentInputParagraphsItemDir.java @@ -6,18 +6,18 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationDraftFreeTextRichTextBodyDir { - public static final AnnotationDraftFreeTextRichTextBodyDir LTR = - new AnnotationDraftFreeTextRichTextBodyDir(Value.LTR, "ltr"); +public final class RichTextDocumentInputParagraphsItemDir { + public static final RichTextDocumentInputParagraphsItemDir LTR = + new RichTextDocumentInputParagraphsItemDir(Value.LTR, "ltr"); - public static final AnnotationDraftFreeTextRichTextBodyDir RTL = - new AnnotationDraftFreeTextRichTextBodyDir(Value.RTL, "rtl"); + public static final RichTextDocumentInputParagraphsItemDir RTL = + new RichTextDocumentInputParagraphsItemDir(Value.RTL, "rtl"); private final Value value; private final String string; - AnnotationDraftFreeTextRichTextBodyDir(Value value, String string) { + RichTextDocumentInputParagraphsItemDir(Value value, String string) { this.value = value; this.string = string; } @@ -35,8 +35,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationDraftFreeTextRichTextBodyDir - && this.string.equals(((AnnotationDraftFreeTextRichTextBodyDir) other).string)); + || (other instanceof RichTextDocumentInputParagraphsItemDir + && this.string.equals(((RichTextDocumentInputParagraphsItemDir) other).string)); } @java.lang.Override @@ -57,14 +57,14 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationDraftFreeTextRichTextBodyDir valueOf(String value) { + public static RichTextDocumentInputParagraphsItemDir valueOf(String value) { switch (value) { case "ltr": return LTR; case "rtl": return RTL; default: - return new AnnotationDraftFreeTextRichTextBodyDir(Value.UNKNOWN, value); + return new RichTextDocumentInputParagraphsItemDir(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyMargins.java b/src/main/java/api/types/RichTextDocumentInputParagraphsItemMargins.java similarity index 86% rename from src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyMargins.java rename to src/main/java/api/types/RichTextDocumentInputParagraphsItemMargins.java index 5d877b5..c037636 100644 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyMargins.java +++ b/src/main/java/api/types/RichTextDocumentInputParagraphsItemMargins.java @@ -16,8 +16,8 @@ import java.util.Objects; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationDraftFreeTextRichTextBodyMargins.Builder.class) -public final class AnnotationDraftFreeTextRichTextBodyMargins { +@JsonDeserialize(builder = RichTextDocumentInputParagraphsItemMargins.Builder.class) +public final class RichTextDocumentInputParagraphsItemMargins { private final double top; private final double bottom; @@ -28,7 +28,7 @@ public final class AnnotationDraftFreeTextRichTextBodyMargins { private final Map additionalProperties; - private AnnotationDraftFreeTextRichTextBodyMargins( + private RichTextDocumentInputParagraphsItemMargins( double top, double bottom, double left, double right, Map additionalProperties) { this.top = top; this.bottom = bottom; @@ -60,8 +60,8 @@ public double getRight() { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationDraftFreeTextRichTextBodyMargins - && equalTo((AnnotationDraftFreeTextRichTextBodyMargins) other); + return other instanceof RichTextDocumentInputParagraphsItemMargins + && equalTo((RichTextDocumentInputParagraphsItemMargins) other); } @JsonAnyGetter @@ -69,7 +69,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationDraftFreeTextRichTextBodyMargins other) { + private boolean equalTo(RichTextDocumentInputParagraphsItemMargins other) { return top == other.top && bottom == other.bottom && left == other.left && right == other.right; } @@ -90,7 +90,7 @@ public static TopStage builder() { public interface TopStage { BottomStage top(double top); - Builder from(AnnotationDraftFreeTextRichTextBodyMargins other); + Builder from(RichTextDocumentInputParagraphsItemMargins other); } public interface BottomStage { @@ -106,7 +106,7 @@ public interface RightStage { } public interface _FinalStage { - AnnotationDraftFreeTextRichTextBodyMargins build(); + RichTextDocumentInputParagraphsItemMargins build(); _FinalStage additionalProperty(String key, Object value); @@ -129,7 +129,7 @@ public static final class Builder implements TopStage, BottomStage, LeftStage, R private Builder() {} @java.lang.Override - public Builder from(AnnotationDraftFreeTextRichTextBodyMargins other) { + public Builder from(RichTextDocumentInputParagraphsItemMargins other) { top(other.getTop()); bottom(other.getBottom()); left(other.getLeft()); @@ -166,8 +166,8 @@ public _FinalStage right(double right) { } @java.lang.Override - public AnnotationDraftFreeTextRichTextBodyMargins build() { - return new AnnotationDraftFreeTextRichTextBodyMargins(top, bottom, left, right, additionalProperties); + public RichTextDocumentInputParagraphsItemMargins build() { + return new RichTextDocumentInputParagraphsItemMargins(top, bottom, left, right, additionalProperties); } @java.lang.Override diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemRunsItem.java b/src/main/java/api/types/RichTextDocumentInputParagraphsItemRunsItem.java similarity index 67% rename from src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemRunsItem.java rename to src/main/java/api/types/RichTextDocumentInputParagraphsItemRunsItem.java index fa15f65..dd4d43e 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemRunsItem.java +++ b/src/main/java/api/types/RichTextDocumentInputParagraphsItemRunsItem.java @@ -19,17 +19,17 @@ import org.jetbrains.annotations.NotNull; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationFreeTextRichTextParagraphsItemRunsItem.Builder.class) -public final class AnnotationFreeTextRichTextParagraphsItemRunsItem { +@JsonDeserialize(builder = RichTextDocumentInputParagraphsItemRunsItem.Builder.class) +public final class RichTextDocumentInputParagraphsItemRunsItem { private final String text; - private final Optional style; + private final Optional style; private final Map additionalProperties; - private AnnotationFreeTextRichTextParagraphsItemRunsItem( + private RichTextDocumentInputParagraphsItemRunsItem( String text, - Optional style, + Optional style, Map additionalProperties) { this.text = text; this.style = style; @@ -42,15 +42,15 @@ public String getText() { } @JsonProperty("style") - public Optional getStyle() { + public Optional getStyle() { return style; } @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationFreeTextRichTextParagraphsItemRunsItem - && equalTo((AnnotationFreeTextRichTextParagraphsItemRunsItem) other); + return other instanceof RichTextDocumentInputParagraphsItemRunsItem + && equalTo((RichTextDocumentInputParagraphsItemRunsItem) other); } @JsonAnyGetter @@ -58,7 +58,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationFreeTextRichTextParagraphsItemRunsItem other) { + private boolean equalTo(RichTextDocumentInputParagraphsItemRunsItem other) { return text.equals(other.text) && style.equals(other.style); } @@ -79,26 +79,26 @@ public static TextStage builder() { public interface TextStage { _FinalStage text(@NotNull String text); - Builder from(AnnotationFreeTextRichTextParagraphsItemRunsItem other); + Builder from(RichTextDocumentInputParagraphsItemRunsItem other); } public interface _FinalStage { - AnnotationFreeTextRichTextParagraphsItemRunsItem build(); + RichTextDocumentInputParagraphsItemRunsItem build(); _FinalStage additionalProperty(String key, Object value); _FinalStage additionalProperties(Map additionalProperties); - _FinalStage style(Optional style); + _FinalStage style(Optional style); - _FinalStage style(AnnotationFreeTextRichTextParagraphsItemRunsItemStyle style); + _FinalStage style(RichTextDocumentInputParagraphsItemRunsItemStyle style); } @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder implements TextStage, _FinalStage { private String text; - private Optional style = Optional.empty(); + private Optional style = Optional.empty(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -106,7 +106,7 @@ public static final class Builder implements TextStage, _FinalStage { private Builder() {} @java.lang.Override - public Builder from(AnnotationFreeTextRichTextParagraphsItemRunsItem other) { + public Builder from(RichTextDocumentInputParagraphsItemRunsItem other) { text(other.getText()); style(other.getStyle()); return this; @@ -120,21 +120,21 @@ public _FinalStage text(@NotNull String text) { } @java.lang.Override - public _FinalStage style(AnnotationFreeTextRichTextParagraphsItemRunsItemStyle style) { + public _FinalStage style(RichTextDocumentInputParagraphsItemRunsItemStyle style) { this.style = Optional.ofNullable(style); return this; } @java.lang.Override @JsonSetter(value = "style", nulls = Nulls.SKIP) - public _FinalStage style(Optional style) { + public _FinalStage style(Optional style) { this.style = style; return this; } @java.lang.Override - public AnnotationFreeTextRichTextParagraphsItemRunsItem build() { - return new AnnotationFreeTextRichTextParagraphsItemRunsItem(text, style, additionalProperties); + public RichTextDocumentInputParagraphsItemRunsItem build() { + return new RichTextDocumentInputParagraphsItemRunsItem(text, style, additionalProperties); } @java.lang.Override diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemRunsItemStyle.java b/src/main/java/api/types/RichTextDocumentInputParagraphsItemRunsItemStyle.java similarity index 82% rename from src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemRunsItemStyle.java rename to src/main/java/api/types/RichTextDocumentInputParagraphsItemRunsItemStyle.java index 6917149..185bd2b 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemRunsItemStyle.java +++ b/src/main/java/api/types/RichTextDocumentInputParagraphsItemRunsItemStyle.java @@ -19,8 +19,8 @@ import java.util.Optional; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationFreeTextRichTextParagraphsItemRunsItemStyle.Builder.class) -public final class AnnotationFreeTextRichTextParagraphsItemRunsItemStyle { +@JsonDeserialize(builder = RichTextDocumentInputParagraphsItemRunsItemStyle.Builder.class) +public final class RichTextDocumentInputParagraphsItemRunsItemStyle { private final Optional family; private final Optional weight; @@ -31,9 +31,9 @@ public final class AnnotationFreeTextRichTextParagraphsItemRunsItemStyle { private final Optional color; - private final Optional> decoration; + private final Optional> decoration; - private final Optional script; + private final Optional script; private final Optional letterSpacing; @@ -43,14 +43,14 @@ public final class AnnotationFreeTextRichTextParagraphsItemRunsItemStyle { private final Map additionalProperties; - private AnnotationFreeTextRichTextParagraphsItemRunsItemStyle( + private RichTextDocumentInputParagraphsItemRunsItemStyle( Optional family, Optional weight, Optional italic, Optional size, Optional color, - Optional> decoration, - Optional script, + Optional> decoration, + Optional script, Optional letterSpacing, Optional horizontalScale, Optional unknown, @@ -94,12 +94,12 @@ public Optional getColor() { } @JsonProperty("decoration") - public Optional> getDecoration() { + public Optional> getDecoration() { return decoration; } @JsonProperty("script") - public Optional getScript() { + public Optional getScript() { return script; } @@ -121,8 +121,8 @@ public Optional getUnknown() { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationFreeTextRichTextParagraphsItemRunsItemStyle - && equalTo((AnnotationFreeTextRichTextParagraphsItemRunsItemStyle) other); + return other instanceof RichTextDocumentInputParagraphsItemRunsItemStyle + && equalTo((RichTextDocumentInputParagraphsItemRunsItemStyle) other); } @JsonAnyGetter @@ -130,7 +130,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationFreeTextRichTextParagraphsItemRunsItemStyle other) { + private boolean equalTo(RichTextDocumentInputParagraphsItemRunsItemStyle other) { return family.equals(other.family) && weight.equals(other.weight) && italic.equals(other.italic) @@ -179,10 +179,10 @@ public static final class Builder { private Optional color = Optional.empty(); - private Optional> decoration = + private Optional> decoration = Optional.empty(); - private Optional script = Optional.empty(); + private Optional script = Optional.empty(); private Optional letterSpacing = Optional.empty(); @@ -195,7 +195,7 @@ public static final class Builder { private Builder() {} - public Builder from(AnnotationFreeTextRichTextParagraphsItemRunsItemStyle other) { + public Builder from(RichTextDocumentInputParagraphsItemRunsItemStyle other) { family(other.getFamily()); weight(other.getWeight()); italic(other.getItalic()); @@ -266,24 +266,23 @@ public Builder color(String color) { @JsonSetter(value = "decoration", nulls = Nulls.SKIP) public Builder decoration( - Optional> decoration) { + Optional> decoration) { this.decoration = decoration; return this; } - public Builder decoration( - List decoration) { + public Builder decoration(List decoration) { this.decoration = Optional.ofNullable(decoration); return this; } @JsonSetter(value = "script", nulls = Nulls.SKIP) - public Builder script(Optional script) { + public Builder script(Optional script) { this.script = script; return this; } - public Builder script(AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript script) { + public Builder script(RichTextDocumentInputParagraphsItemRunsItemStyleScript script) { this.script = Optional.ofNullable(script); return this; } @@ -321,8 +320,8 @@ public Builder unknown(String unknown) { return this; } - public AnnotationFreeTextRichTextParagraphsItemRunsItemStyle build() { - return new AnnotationFreeTextRichTextParagraphsItemRunsItemStyle( + public RichTextDocumentInputParagraphsItemRunsItemStyle build() { + return new RichTextDocumentInputParagraphsItemRunsItemStyle( family, weight, italic, diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem.java b/src/main/java/api/types/RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem.java similarity index 57% rename from src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem.java rename to src/main/java/api/types/RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem.java index 243cd21..ef5be0e 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem.java +++ b/src/main/java/api/types/RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem.java @@ -6,21 +6,21 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem { - public static final AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem WORD = - new AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem(Value.WORD, "word"); +public final class RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem { + public static final RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem WORD = + new RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem(Value.WORD, "word"); - public static final AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem UNDERLINE = - new AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem(Value.UNDERLINE, "underline"); + public static final RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem UNDERLINE = + new RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem(Value.UNDERLINE, "underline"); - public static final AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem LINE_THROUGH = - new AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem(Value.LINE_THROUGH, "line-through"); + public static final RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem LINE_THROUGH = + new RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem(Value.LINE_THROUGH, "line-through"); private final Value value; private final String string; - AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem(Value value, String string) { + RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem(Value value, String string) { this.value = value; this.string = string; } @@ -38,9 +38,9 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem + || (other instanceof RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem && this.string.equals( - ((AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem) other).string)); + ((RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem) other).string)); } @java.lang.Override @@ -63,7 +63,7 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem valueOf(String value) { + public static RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem valueOf(String value) { switch (value) { case "word": return WORD; @@ -72,7 +72,7 @@ public static AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationIte case "line-through": return LINE_THROUGH; default: - return new AnnotationFreeTextRichTextParagraphsItemRunsItemStyleDecorationItem(Value.UNKNOWN, value); + return new RichTextDocumentInputParagraphsItemRunsItemStyleDecorationItem(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript.java b/src/main/java/api/types/RichTextDocumentInputParagraphsItemRunsItemStyleScript.java similarity index 57% rename from src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript.java rename to src/main/java/api/types/RichTextDocumentInputParagraphsItemRunsItemStyleScript.java index da22a45..b859f6f 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript.java +++ b/src/main/java/api/types/RichTextDocumentInputParagraphsItemRunsItemStyleScript.java @@ -6,21 +6,21 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript { - public static final AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript SUB = - new AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript(Value.SUB, "sub"); +public final class RichTextDocumentInputParagraphsItemRunsItemStyleScript { + public static final RichTextDocumentInputParagraphsItemRunsItemStyleScript SUB = + new RichTextDocumentInputParagraphsItemRunsItemStyleScript(Value.SUB, "sub"); - public static final AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript NORMAL = - new AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript(Value.NORMAL, "normal"); + public static final RichTextDocumentInputParagraphsItemRunsItemStyleScript NORMAL = + new RichTextDocumentInputParagraphsItemRunsItemStyleScript(Value.NORMAL, "normal"); - public static final AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript SUPER = - new AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript(Value.SUPER, "super"); + public static final RichTextDocumentInputParagraphsItemRunsItemStyleScript SUPER = + new RichTextDocumentInputParagraphsItemRunsItemStyleScript(Value.SUPER, "super"); private final Value value; private final String string; - AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript(Value value, String string) { + RichTextDocumentInputParagraphsItemRunsItemStyleScript(Value value, String string) { this.value = value; this.string = string; } @@ -38,9 +38,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript - && this.string.equals( - ((AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript) other).string)); + || (other instanceof RichTextDocumentInputParagraphsItemRunsItemStyleScript + && this.string.equals(((RichTextDocumentInputParagraphsItemRunsItemStyleScript) other).string)); } @java.lang.Override @@ -63,7 +62,7 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript valueOf(String value) { + public static RichTextDocumentInputParagraphsItemRunsItemStyleScript valueOf(String value) { switch (value) { case "sub": return SUB; @@ -72,7 +71,7 @@ public static AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript valueO case "super": return SUPER; default: - return new AnnotationFreeTextRichTextParagraphsItemRunsItemStyleScript(Value.UNKNOWN, value); + return new RichTextDocumentInputParagraphsItemRunsItemStyleScript(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItem.java b/src/main/java/api/types/RichTextDocumentParagraphsItem.java similarity index 68% rename from src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItem.java rename to src/main/java/api/types/RichTextDocumentParagraphsItem.java index 3c5afa3..164aeaf 100644 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItem.java +++ b/src/main/java/api/types/RichTextDocumentParagraphsItem.java @@ -20,32 +20,32 @@ import java.util.Optional; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationPatchFreeTextRichTextParagraphsItem.Builder.class) -public final class AnnotationPatchFreeTextRichTextParagraphsItem { - private final Optional align; +@JsonDeserialize(builder = RichTextDocumentParagraphsItem.Builder.class) +public final class RichTextDocumentParagraphsItem { + private final Optional align; - private final Optional dir; + private final Optional dir; private final Optional lineHeight; - private final Optional margins; + private final Optional margins; private final Optional textIndent; private final Optional unknown; - private final List runs; + private final List runs; private final Map additionalProperties; - private AnnotationPatchFreeTextRichTextParagraphsItem( - Optional align, - Optional dir, + private RichTextDocumentParagraphsItem( + Optional align, + Optional dir, Optional lineHeight, - Optional margins, + Optional margins, Optional textIndent, Optional unknown, - List runs, + List runs, Map additionalProperties) { this.align = align; this.dir = dir; @@ -58,12 +58,12 @@ private AnnotationPatchFreeTextRichTextParagraphsItem( } @JsonProperty("align") - public Optional getAlign() { + public Optional getAlign() { return align; } @JsonProperty("dir") - public Optional getDir() { + public Optional getDir() { return dir; } @@ -73,7 +73,7 @@ public Optional getLineHeight() { } @JsonProperty("margins") - public Optional getMargins() { + public Optional getMargins() { return margins; } @@ -88,15 +88,14 @@ public Optional getUnknown() { } @JsonProperty("runs") - public List getRuns() { + public List getRuns() { return runs; } @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationPatchFreeTextRichTextParagraphsItem - && equalTo((AnnotationPatchFreeTextRichTextParagraphsItem) other); + return other instanceof RichTextDocumentParagraphsItem && equalTo((RichTextDocumentParagraphsItem) other); } @JsonAnyGetter @@ -104,7 +103,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationPatchFreeTextRichTextParagraphsItem other) { + private boolean equalTo(RichTextDocumentParagraphsItem other) { return align.equals(other.align) && dir.equals(other.dir) && lineHeight.equals(other.lineHeight) @@ -131,26 +130,26 @@ public static Builder builder() { @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder { - private Optional align = Optional.empty(); + private Optional align = Optional.empty(); - private Optional dir = Optional.empty(); + private Optional dir = Optional.empty(); private Optional lineHeight = Optional.empty(); - private Optional margins = Optional.empty(); + private Optional margins = Optional.empty(); private Optional textIndent = Optional.empty(); private Optional unknown = Optional.empty(); - private List runs = new ArrayList<>(); + private List runs = new ArrayList<>(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); private Builder() {} - public Builder from(AnnotationPatchFreeTextRichTextParagraphsItem other) { + public Builder from(RichTextDocumentParagraphsItem other) { align(other.getAlign()); dir(other.getDir()); lineHeight(other.getLineHeight()); @@ -162,23 +161,23 @@ public Builder from(AnnotationPatchFreeTextRichTextParagraphsItem other) { } @JsonSetter(value = "align", nulls = Nulls.SKIP) - public Builder align(Optional align) { + public Builder align(Optional align) { this.align = align; return this; } - public Builder align(AnnotationPatchFreeTextRichTextParagraphsItemAlign align) { + public Builder align(RichTextDocumentParagraphsItemAlign align) { this.align = Optional.ofNullable(align); return this; } @JsonSetter(value = "dir", nulls = Nulls.SKIP) - public Builder dir(Optional dir) { + public Builder dir(Optional dir) { this.dir = dir; return this; } - public Builder dir(AnnotationPatchFreeTextRichTextParagraphsItemDir dir) { + public Builder dir(RichTextDocumentParagraphsItemDir dir) { this.dir = Optional.ofNullable(dir); return this; } @@ -195,12 +194,12 @@ public Builder lineHeight(Double lineHeight) { } @JsonSetter(value = "margins", nulls = Nulls.SKIP) - public Builder margins(Optional margins) { + public Builder margins(Optional margins) { this.margins = margins; return this; } - public Builder margins(AnnotationPatchFreeTextRichTextParagraphsItemMargins margins) { + public Builder margins(RichTextDocumentParagraphsItemMargins margins) { this.margins = Optional.ofNullable(margins); return this; } @@ -228,7 +227,7 @@ public Builder unknown(String unknown) { } @JsonSetter(value = "runs", nulls = Nulls.SKIP) - public Builder runs(List runs) { + public Builder runs(List runs) { this.runs.clear(); if (runs != null) { this.runs.addAll(runs); @@ -236,20 +235,20 @@ public Builder runs(List return this; } - public Builder addRuns(AnnotationPatchFreeTextRichTextParagraphsItemRunsItem runs) { + public Builder addRuns(RichTextDocumentParagraphsItemRunsItem runs) { this.runs.add(runs); return this; } - public Builder addAllRuns(List runs) { + public Builder addAllRuns(List runs) { if (runs != null) { this.runs.addAll(runs); } return this; } - public AnnotationPatchFreeTextRichTextParagraphsItem build() { - return new AnnotationPatchFreeTextRichTextParagraphsItem( + public RichTextDocumentParagraphsItem build() { + return new RichTextDocumentParagraphsItem( align, dir, lineHeight, margins, textIndent, unknown, runs, additionalProperties); } diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextBodyAlign.java b/src/main/java/api/types/RichTextDocumentParagraphsItemAlign.java similarity index 67% rename from src/main/java/api/types/AnnotationFreeTextRichTextBodyAlign.java rename to src/main/java/api/types/RichTextDocumentParagraphsItemAlign.java index 0027f0b..e858e13 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextBodyAlign.java +++ b/src/main/java/api/types/RichTextDocumentParagraphsItemAlign.java @@ -6,24 +6,24 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationFreeTextRichTextBodyAlign { - public static final AnnotationFreeTextRichTextBodyAlign JUSTIFY = - new AnnotationFreeTextRichTextBodyAlign(Value.JUSTIFY, "justify"); +public final class RichTextDocumentParagraphsItemAlign { + public static final RichTextDocumentParagraphsItemAlign JUSTIFY = + new RichTextDocumentParagraphsItemAlign(Value.JUSTIFY, "justify"); - public static final AnnotationFreeTextRichTextBodyAlign LEFT = - new AnnotationFreeTextRichTextBodyAlign(Value.LEFT, "left"); + public static final RichTextDocumentParagraphsItemAlign LEFT = + new RichTextDocumentParagraphsItemAlign(Value.LEFT, "left"); - public static final AnnotationFreeTextRichTextBodyAlign RIGHT = - new AnnotationFreeTextRichTextBodyAlign(Value.RIGHT, "right"); + public static final RichTextDocumentParagraphsItemAlign RIGHT = + new RichTextDocumentParagraphsItemAlign(Value.RIGHT, "right"); - public static final AnnotationFreeTextRichTextBodyAlign CENTER = - new AnnotationFreeTextRichTextBodyAlign(Value.CENTER, "center"); + public static final RichTextDocumentParagraphsItemAlign CENTER = + new RichTextDocumentParagraphsItemAlign(Value.CENTER, "center"); private final Value value; private final String string; - AnnotationFreeTextRichTextBodyAlign(Value value, String string) { + RichTextDocumentParagraphsItemAlign(Value value, String string) { this.value = value; this.string = string; } @@ -41,8 +41,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationFreeTextRichTextBodyAlign - && this.string.equals(((AnnotationFreeTextRichTextBodyAlign) other).string)); + || (other instanceof RichTextDocumentParagraphsItemAlign + && this.string.equals(((RichTextDocumentParagraphsItemAlign) other).string)); } @java.lang.Override @@ -67,7 +67,7 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationFreeTextRichTextBodyAlign valueOf(String value) { + public static RichTextDocumentParagraphsItemAlign valueOf(String value) { switch (value) { case "justify": return JUSTIFY; @@ -78,7 +78,7 @@ public static AnnotationFreeTextRichTextBodyAlign valueOf(String value) { case "center": return CENTER; default: - return new AnnotationFreeTextRichTextBodyAlign(Value.UNKNOWN, value); + return new RichTextDocumentParagraphsItemAlign(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextBodyDir.java b/src/main/java/api/types/RichTextDocumentParagraphsItemDir.java similarity index 69% rename from src/main/java/api/types/AnnotationFreeTextRichTextBodyDir.java rename to src/main/java/api/types/RichTextDocumentParagraphsItemDir.java index 948d209..cccf84d 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextBodyDir.java +++ b/src/main/java/api/types/RichTextDocumentParagraphsItemDir.java @@ -6,16 +6,16 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationFreeTextRichTextBodyDir { - public static final AnnotationFreeTextRichTextBodyDir LTR = new AnnotationFreeTextRichTextBodyDir(Value.LTR, "ltr"); +public final class RichTextDocumentParagraphsItemDir { + public static final RichTextDocumentParagraphsItemDir LTR = new RichTextDocumentParagraphsItemDir(Value.LTR, "ltr"); - public static final AnnotationFreeTextRichTextBodyDir RTL = new AnnotationFreeTextRichTextBodyDir(Value.RTL, "rtl"); + public static final RichTextDocumentParagraphsItemDir RTL = new RichTextDocumentParagraphsItemDir(Value.RTL, "rtl"); private final Value value; private final String string; - AnnotationFreeTextRichTextBodyDir(Value value, String string) { + RichTextDocumentParagraphsItemDir(Value value, String string) { this.value = value; this.string = string; } @@ -33,8 +33,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationFreeTextRichTextBodyDir - && this.string.equals(((AnnotationFreeTextRichTextBodyDir) other).string)); + || (other instanceof RichTextDocumentParagraphsItemDir + && this.string.equals(((RichTextDocumentParagraphsItemDir) other).string)); } @java.lang.Override @@ -55,14 +55,14 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationFreeTextRichTextBodyDir valueOf(String value) { + public static RichTextDocumentParagraphsItemDir valueOf(String value) { switch (value) { case "ltr": return LTR; case "rtl": return RTL; default: - return new AnnotationFreeTextRichTextBodyDir(Value.UNKNOWN, value); + return new RichTextDocumentParagraphsItemDir(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationFreeTextRichTextBodyMargins.java b/src/main/java/api/types/RichTextDocumentParagraphsItemMargins.java similarity index 87% rename from src/main/java/api/types/AnnotationFreeTextRichTextBodyMargins.java rename to src/main/java/api/types/RichTextDocumentParagraphsItemMargins.java index e320678..07c5894 100644 --- a/src/main/java/api/types/AnnotationFreeTextRichTextBodyMargins.java +++ b/src/main/java/api/types/RichTextDocumentParagraphsItemMargins.java @@ -16,8 +16,8 @@ import java.util.Objects; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationFreeTextRichTextBodyMargins.Builder.class) -public final class AnnotationFreeTextRichTextBodyMargins { +@JsonDeserialize(builder = RichTextDocumentParagraphsItemMargins.Builder.class) +public final class RichTextDocumentParagraphsItemMargins { private final double top; private final double bottom; @@ -28,7 +28,7 @@ public final class AnnotationFreeTextRichTextBodyMargins { private final Map additionalProperties; - private AnnotationFreeTextRichTextBodyMargins( + private RichTextDocumentParagraphsItemMargins( double top, double bottom, double left, double right, Map additionalProperties) { this.top = top; this.bottom = bottom; @@ -60,8 +60,8 @@ public double getRight() { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationFreeTextRichTextBodyMargins - && equalTo((AnnotationFreeTextRichTextBodyMargins) other); + return other instanceof RichTextDocumentParagraphsItemMargins + && equalTo((RichTextDocumentParagraphsItemMargins) other); } @JsonAnyGetter @@ -69,7 +69,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationFreeTextRichTextBodyMargins other) { + private boolean equalTo(RichTextDocumentParagraphsItemMargins other) { return top == other.top && bottom == other.bottom && left == other.left && right == other.right; } @@ -90,7 +90,7 @@ public static TopStage builder() { public interface TopStage { BottomStage top(double top); - Builder from(AnnotationFreeTextRichTextBodyMargins other); + Builder from(RichTextDocumentParagraphsItemMargins other); } public interface BottomStage { @@ -106,7 +106,7 @@ public interface RightStage { } public interface _FinalStage { - AnnotationFreeTextRichTextBodyMargins build(); + RichTextDocumentParagraphsItemMargins build(); _FinalStage additionalProperty(String key, Object value); @@ -129,7 +129,7 @@ public static final class Builder implements TopStage, BottomStage, LeftStage, R private Builder() {} @java.lang.Override - public Builder from(AnnotationFreeTextRichTextBodyMargins other) { + public Builder from(RichTextDocumentParagraphsItemMargins other) { top(other.getTop()); bottom(other.getBottom()); left(other.getLeft()); @@ -166,8 +166,8 @@ public _FinalStage right(double right) { } @java.lang.Override - public AnnotationFreeTextRichTextBodyMargins build() { - return new AnnotationFreeTextRichTextBodyMargins(top, bottom, left, right, additionalProperties); + public RichTextDocumentParagraphsItemMargins build() { + return new RichTextDocumentParagraphsItemMargins(top, bottom, left, right, additionalProperties); } @java.lang.Override diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItem.java b/src/main/java/api/types/RichTextDocumentParagraphsItemRunsItem.java similarity index 66% rename from src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItem.java rename to src/main/java/api/types/RichTextDocumentParagraphsItemRunsItem.java index f27f556..0be9e4e 100644 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItem.java +++ b/src/main/java/api/types/RichTextDocumentParagraphsItemRunsItem.java @@ -19,17 +19,17 @@ import org.jetbrains.annotations.NotNull; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationPatchFreeTextRichTextParagraphsItemRunsItem.Builder.class) -public final class AnnotationPatchFreeTextRichTextParagraphsItemRunsItem { +@JsonDeserialize(builder = RichTextDocumentParagraphsItemRunsItem.Builder.class) +public final class RichTextDocumentParagraphsItemRunsItem { private final String text; - private final Optional style; + private final Optional style; private final Map additionalProperties; - private AnnotationPatchFreeTextRichTextParagraphsItemRunsItem( + private RichTextDocumentParagraphsItemRunsItem( String text, - Optional style, + Optional style, Map additionalProperties) { this.text = text; this.style = style; @@ -42,15 +42,15 @@ public String getText() { } @JsonProperty("style") - public Optional getStyle() { + public Optional getStyle() { return style; } @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationPatchFreeTextRichTextParagraphsItemRunsItem - && equalTo((AnnotationPatchFreeTextRichTextParagraphsItemRunsItem) other); + return other instanceof RichTextDocumentParagraphsItemRunsItem + && equalTo((RichTextDocumentParagraphsItemRunsItem) other); } @JsonAnyGetter @@ -58,7 +58,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationPatchFreeTextRichTextParagraphsItemRunsItem other) { + private boolean equalTo(RichTextDocumentParagraphsItemRunsItem other) { return text.equals(other.text) && style.equals(other.style); } @@ -79,26 +79,26 @@ public static TextStage builder() { public interface TextStage { _FinalStage text(@NotNull String text); - Builder from(AnnotationPatchFreeTextRichTextParagraphsItemRunsItem other); + Builder from(RichTextDocumentParagraphsItemRunsItem other); } public interface _FinalStage { - AnnotationPatchFreeTextRichTextParagraphsItemRunsItem build(); + RichTextDocumentParagraphsItemRunsItem build(); _FinalStage additionalProperty(String key, Object value); _FinalStage additionalProperties(Map additionalProperties); - _FinalStage style(Optional style); + _FinalStage style(Optional style); - _FinalStage style(AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle style); + _FinalStage style(RichTextDocumentParagraphsItemRunsItemStyle style); } @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder implements TextStage, _FinalStage { private String text; - private Optional style = Optional.empty(); + private Optional style = Optional.empty(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -106,7 +106,7 @@ public static final class Builder implements TextStage, _FinalStage { private Builder() {} @java.lang.Override - public Builder from(AnnotationPatchFreeTextRichTextParagraphsItemRunsItem other) { + public Builder from(RichTextDocumentParagraphsItemRunsItem other) { text(other.getText()); style(other.getStyle()); return this; @@ -120,21 +120,21 @@ public _FinalStage text(@NotNull String text) { } @java.lang.Override - public _FinalStage style(AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle style) { + public _FinalStage style(RichTextDocumentParagraphsItemRunsItemStyle style) { this.style = Optional.ofNullable(style); return this; } @java.lang.Override @JsonSetter(value = "style", nulls = Nulls.SKIP) - public _FinalStage style(Optional style) { + public _FinalStage style(Optional style) { this.style = style; return this; } @java.lang.Override - public AnnotationPatchFreeTextRichTextParagraphsItemRunsItem build() { - return new AnnotationPatchFreeTextRichTextParagraphsItemRunsItem(text, style, additionalProperties); + public RichTextDocumentParagraphsItemRunsItem build() { + return new RichTextDocumentParagraphsItemRunsItem(text, style, additionalProperties); } @java.lang.Override diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle.java b/src/main/java/api/types/RichTextDocumentParagraphsItemRunsItemStyle.java similarity index 80% rename from src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle.java rename to src/main/java/api/types/RichTextDocumentParagraphsItemRunsItemStyle.java index 42048b9..62b9493 100644 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle.java +++ b/src/main/java/api/types/RichTextDocumentParagraphsItemRunsItemStyle.java @@ -19,8 +19,8 @@ import java.util.Optional; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle.Builder.class) -public final class AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle { +@JsonDeserialize(builder = RichTextDocumentParagraphsItemRunsItemStyle.Builder.class) +public final class RichTextDocumentParagraphsItemRunsItemStyle { private final Optional family; private final Optional weight; @@ -31,9 +31,9 @@ public final class AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle { private final Optional color; - private final Optional> decoration; + private final Optional> decoration; - private final Optional script; + private final Optional script; private final Optional letterSpacing; @@ -43,14 +43,14 @@ public final class AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle { private final Map additionalProperties; - private AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle( + private RichTextDocumentParagraphsItemRunsItemStyle( Optional family, Optional weight, Optional italic, Optional size, Optional color, - Optional> decoration, - Optional script, + Optional> decoration, + Optional script, Optional letterSpacing, Optional horizontalScale, Optional unknown, @@ -94,12 +94,12 @@ public Optional getColor() { } @JsonProperty("decoration") - public Optional> getDecoration() { + public Optional> getDecoration() { return decoration; } @JsonProperty("script") - public Optional getScript() { + public Optional getScript() { return script; } @@ -121,8 +121,8 @@ public Optional getUnknown() { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle - && equalTo((AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle) other); + return other instanceof RichTextDocumentParagraphsItemRunsItemStyle + && equalTo((RichTextDocumentParagraphsItemRunsItemStyle) other); } @JsonAnyGetter @@ -130,7 +130,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle other) { + private boolean equalTo(RichTextDocumentParagraphsItemRunsItemStyle other) { return family.equals(other.family) && weight.equals(other.weight) && italic.equals(other.italic) @@ -179,10 +179,9 @@ public static final class Builder { private Optional color = Optional.empty(); - private Optional> decoration = - Optional.empty(); + private Optional> decoration = Optional.empty(); - private Optional script = Optional.empty(); + private Optional script = Optional.empty(); private Optional letterSpacing = Optional.empty(); @@ -195,7 +194,7 @@ public static final class Builder { private Builder() {} - public Builder from(AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle other) { + public Builder from(RichTextDocumentParagraphsItemRunsItemStyle other) { family(other.getFamily()); weight(other.getWeight()); italic(other.getItalic()); @@ -266,24 +265,23 @@ public Builder color(String color) { @JsonSetter(value = "decoration", nulls = Nulls.SKIP) public Builder decoration( - Optional> decoration) { + Optional> decoration) { this.decoration = decoration; return this; } - public Builder decoration( - List decoration) { + public Builder decoration(List decoration) { this.decoration = Optional.ofNullable(decoration); return this; } @JsonSetter(value = "script", nulls = Nulls.SKIP) - public Builder script(Optional script) { + public Builder script(Optional script) { this.script = script; return this; } - public Builder script(AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyleScript script) { + public Builder script(RichTextDocumentParagraphsItemRunsItemStyleScript script) { this.script = Optional.ofNullable(script); return this; } @@ -321,8 +319,8 @@ public Builder unknown(String unknown) { return this; } - public AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle build() { - return new AnnotationPatchFreeTextRichTextParagraphsItemRunsItemStyle( + public RichTextDocumentParagraphsItemRunsItemStyle build() { + return new RichTextDocumentParagraphsItemRunsItemStyle( family, weight, italic, diff --git a/src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyDecorationItem.java b/src/main/java/api/types/RichTextDocumentParagraphsItemRunsItemStyleDecorationItem.java similarity index 58% rename from src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyDecorationItem.java rename to src/main/java/api/types/RichTextDocumentParagraphsItemRunsItemStyleDecorationItem.java index ab67782..2934219 100644 --- a/src/main/java/api/types/AnnotationDraftFreeTextRichTextBodyDecorationItem.java +++ b/src/main/java/api/types/RichTextDocumentParagraphsItemRunsItemStyleDecorationItem.java @@ -6,21 +6,21 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationDraftFreeTextRichTextBodyDecorationItem { - public static final AnnotationDraftFreeTextRichTextBodyDecorationItem WORD = - new AnnotationDraftFreeTextRichTextBodyDecorationItem(Value.WORD, "word"); +public final class RichTextDocumentParagraphsItemRunsItemStyleDecorationItem { + public static final RichTextDocumentParagraphsItemRunsItemStyleDecorationItem WORD = + new RichTextDocumentParagraphsItemRunsItemStyleDecorationItem(Value.WORD, "word"); - public static final AnnotationDraftFreeTextRichTextBodyDecorationItem UNDERLINE = - new AnnotationDraftFreeTextRichTextBodyDecorationItem(Value.UNDERLINE, "underline"); + public static final RichTextDocumentParagraphsItemRunsItemStyleDecorationItem UNDERLINE = + new RichTextDocumentParagraphsItemRunsItemStyleDecorationItem(Value.UNDERLINE, "underline"); - public static final AnnotationDraftFreeTextRichTextBodyDecorationItem LINE_THROUGH = - new AnnotationDraftFreeTextRichTextBodyDecorationItem(Value.LINE_THROUGH, "line-through"); + public static final RichTextDocumentParagraphsItemRunsItemStyleDecorationItem LINE_THROUGH = + new RichTextDocumentParagraphsItemRunsItemStyleDecorationItem(Value.LINE_THROUGH, "line-through"); private final Value value; private final String string; - AnnotationDraftFreeTextRichTextBodyDecorationItem(Value value, String string) { + RichTextDocumentParagraphsItemRunsItemStyleDecorationItem(Value value, String string) { this.value = value; this.string = string; } @@ -38,8 +38,9 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationDraftFreeTextRichTextBodyDecorationItem - && this.string.equals(((AnnotationDraftFreeTextRichTextBodyDecorationItem) other).string)); + || (other instanceof RichTextDocumentParagraphsItemRunsItemStyleDecorationItem + && this.string.equals( + ((RichTextDocumentParagraphsItemRunsItemStyleDecorationItem) other).string)); } @java.lang.Override @@ -62,7 +63,7 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationDraftFreeTextRichTextBodyDecorationItem valueOf(String value) { + public static RichTextDocumentParagraphsItemRunsItemStyleDecorationItem valueOf(String value) { switch (value) { case "word": return WORD; @@ -71,7 +72,7 @@ public static AnnotationDraftFreeTextRichTextBodyDecorationItem valueOf(String v case "line-through": return LINE_THROUGH; default: - return new AnnotationDraftFreeTextRichTextBodyDecorationItem(Value.UNKNOWN, value); + return new RichTextDocumentParagraphsItemRunsItemStyleDecorationItem(Value.UNKNOWN, value); } } diff --git a/src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyScript.java b/src/main/java/api/types/RichTextDocumentParagraphsItemRunsItemStyleScript.java similarity index 60% rename from src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyScript.java rename to src/main/java/api/types/RichTextDocumentParagraphsItemRunsItemStyleScript.java index de8356f..733d629 100644 --- a/src/main/java/api/types/AnnotationPatchFreeTextRichTextBodyScript.java +++ b/src/main/java/api/types/RichTextDocumentParagraphsItemRunsItemStyleScript.java @@ -6,21 +6,21 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public final class AnnotationPatchFreeTextRichTextBodyScript { - public static final AnnotationPatchFreeTextRichTextBodyScript SUB = - new AnnotationPatchFreeTextRichTextBodyScript(Value.SUB, "sub"); +public final class RichTextDocumentParagraphsItemRunsItemStyleScript { + public static final RichTextDocumentParagraphsItemRunsItemStyleScript SUB = + new RichTextDocumentParagraphsItemRunsItemStyleScript(Value.SUB, "sub"); - public static final AnnotationPatchFreeTextRichTextBodyScript NORMAL = - new AnnotationPatchFreeTextRichTextBodyScript(Value.NORMAL, "normal"); + public static final RichTextDocumentParagraphsItemRunsItemStyleScript NORMAL = + new RichTextDocumentParagraphsItemRunsItemStyleScript(Value.NORMAL, "normal"); - public static final AnnotationPatchFreeTextRichTextBodyScript SUPER = - new AnnotationPatchFreeTextRichTextBodyScript(Value.SUPER, "super"); + public static final RichTextDocumentParagraphsItemRunsItemStyleScript SUPER = + new RichTextDocumentParagraphsItemRunsItemStyleScript(Value.SUPER, "super"); private final Value value; private final String string; - AnnotationPatchFreeTextRichTextBodyScript(Value value, String string) { + RichTextDocumentParagraphsItemRunsItemStyleScript(Value value, String string) { this.value = value; this.string = string; } @@ -38,8 +38,8 @@ public String toString() { @java.lang.Override public boolean equals(Object other) { return (this == other) - || (other instanceof AnnotationPatchFreeTextRichTextBodyScript - && this.string.equals(((AnnotationPatchFreeTextRichTextBodyScript) other).string)); + || (other instanceof RichTextDocumentParagraphsItemRunsItemStyleScript + && this.string.equals(((RichTextDocumentParagraphsItemRunsItemStyleScript) other).string)); } @java.lang.Override @@ -62,7 +62,7 @@ public T visit(Visitor visitor) { } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - public static AnnotationPatchFreeTextRichTextBodyScript valueOf(String value) { + public static RichTextDocumentParagraphsItemRunsItemStyleScript valueOf(String value) { switch (value) { case "sub": return SUB; @@ -71,7 +71,7 @@ public static AnnotationPatchFreeTextRichTextBodyScript valueOf(String value) { case "super": return SUPER; default: - return new AnnotationPatchFreeTextRichTextBodyScript(Value.UNKNOWN, value); + return new RichTextDocumentParagraphsItemRunsItemStyleScript(Value.UNKNOWN, value); } }