diff --git a/README.md b/README.md index 7f6df63..ce7cb74 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The recommended way to install it is with Gradle: } dependencies { - implementation("com.lacunasoftware.signer:signer-client:2.9.0") + implementation("com.lacunasoftware.signer:signer-client:2.9.1") ... } @@ -22,7 +22,7 @@ Or with Maven: com.lacunasoftware.signer signer-client - 2.9.0 + 2.9.1 pom diff --git a/build.gradle b/build.gradle index 1627e35..73f71eb 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ targetCompatibility = JavaVersion.VERSION_1_8 group = 'com.lacunasoftware.signer' archivesBaseName = 'signer-client' -version = '2.9.0' +version = '2.9.1' repositories { mavenCentral() @@ -17,12 +17,12 @@ repositories { dependencies { implementation 'io.swagger.core.v3:swagger-annotations:2.1.1' - implementation 'com.google.code.gson:gson:2.8.1' + implementation 'com.google.code.gson:gson:2.11.0' implementation group: 'org.threeten', name: 'threetenbp', version: '1.4.4' - implementation 'com.fasterxml.jackson.core:jackson-core:2.10.1' - implementation 'com.fasterxml.jackson.core:jackson-annotations:2.10.1' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.1' + implementation 'com.fasterxml.jackson.core:jackson-core:2.18.0' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.18.0' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.0' implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.12.1' @@ -113,3 +113,25 @@ signing { sign publishing.publications.mavenJava sign configurations.archives } + +// **New Task for Building a JAR** +task buildJar(type: Jar) { + archiveBaseName.set(archivesBaseName) + archiveVersion.set(version) + from sourceSets.main.output + + // Include dependencies in the JAR + dependsOn configurations.runtimeClasspath + from { + configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } + } + + manifest { + attributes( + 'Main-Class': 'com.lacunasoftware.signer.Main' // Replace with your main class + ) + } + + // Handle duplicate files gracefully (e.g., LICENSE files) + duplicatesStrategy = DuplicatesStrategy.EXCLUDE +} diff --git a/src/main/java/com/lacunasoftware/signer/ActionStatus.java b/src/main/java/com/lacunasoftware/signer/ActionStatus.java index 5b96259..db6238c 100644 --- a/src/main/java/com/lacunasoftware/signer/ActionStatus.java +++ b/src/main/java/com/lacunasoftware/signer/ActionStatus.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -45,7 +43,7 @@ public String toString() { @JsonCreator public static ActionStatus fromValue(String input) { for (ActionStatus b : ActionStatus.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/AgentTypes.java b/src/main/java/com/lacunasoftware/signer/AgentTypes.java index afe6212..c3d9930 100644 --- a/src/main/java/com/lacunasoftware/signer/AgentTypes.java +++ b/src/main/java/com/lacunasoftware/signer/AgentTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -43,7 +41,7 @@ public String toString() { @JsonCreator public static AgentTypes fromValue(String input) { for (AgentTypes b : AgentTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/ApiUploadsBody.java b/src/main/java/com/lacunasoftware/signer/ApiUploadsBody.java index f6c23f8..d093ddf 100644 --- a/src/main/java/com/lacunasoftware/signer/ApiUploadsBody.java +++ b/src/main/java/com/lacunasoftware/signer/ApiUploadsBody.java @@ -12,13 +12,13 @@ package com.lacunasoftware.signer; +import java.io.File; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.io.File; /** * ApiUploadsBody */ @@ -26,6 +26,7 @@ public class ApiUploadsBody { @JsonProperty("file") + @SerializedName("file") private File file = null; public ApiUploadsBody file(File file) { diff --git a/src/main/java/com/lacunasoftware/signer/AuthenticationTypes.java b/src/main/java/com/lacunasoftware/signer/AuthenticationTypes.java index f7b265b..361f144 100644 --- a/src/main/java/com/lacunasoftware/signer/AuthenticationTypes.java +++ b/src/main/java/com/lacunasoftware/signer/AuthenticationTypes.java @@ -12,9 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; -import io.swagger.v3.oas.annotations.media.Schema; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -51,7 +48,7 @@ public String toString() { @JsonCreator public static AuthenticationTypes fromValue(String input) { for (AuthenticationTypes b : AuthenticationTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/BatchItemResultModel.java b/src/main/java/com/lacunasoftware/signer/BatchItemResultModel.java index e812f59..991c4cc 100644 --- a/src/main/java/com/lacunasoftware/signer/BatchItemResultModel.java +++ b/src/main/java/com/lacunasoftware/signer/BatchItemResultModel.java @@ -13,25 +13,29 @@ package com.lacunasoftware.signer; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * BatchItemResultModel */ public class BatchItemResultModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private UUID id = null; + @JsonProperty("success") + @SerializedName("success") - @JsonProperty("success") private Boolean success = null; + @JsonProperty("errorMessage") + @SerializedName("errorMessage") - @JsonProperty("errorMessage") private String errorMessage = null; public BatchItemResultModel id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/BillingInformationTypes.java b/src/main/java/com/lacunasoftware/signer/BillingInformationTypes.java index be483d7..eacf72f 100644 --- a/src/main/java/com/lacunasoftware/signer/BillingInformationTypes.java +++ b/src/main/java/com/lacunasoftware/signer/BillingInformationTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -43,7 +41,7 @@ public String toString() { @JsonCreator public static BillingInformationTypes fromValue(String input) { for (BillingInformationTypes b : BillingInformationTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/Body.java b/src/main/java/com/lacunasoftware/signer/Body.java index 735f6b0..cb07175 100644 --- a/src/main/java/com/lacunasoftware/signer/Body.java +++ b/src/main/java/com/lacunasoftware/signer/Body.java @@ -12,20 +12,22 @@ package com.lacunasoftware.signer; +import java.io.File; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.io.File; /** * Body */ public class Body { - @JsonProperty("file") + @JsonProperty("file") + @SerializedName("file") + private File file = null; public Body file(File file) { diff --git a/src/main/java/com/lacunasoftware/signer/CertificateHolderTypes.java b/src/main/java/com/lacunasoftware/signer/CertificateHolderTypes.java index 71b5d0c..eb490c2 100644 --- a/src/main/java/com/lacunasoftware/signer/CertificateHolderTypes.java +++ b/src/main/java/com/lacunasoftware/signer/CertificateHolderTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -43,7 +41,7 @@ public String toString() { @JsonCreator public static CertificateHolderTypes fromValue(String input) { for (CertificateHolderTypes b : CertificateHolderTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/CertificateTypes.java b/src/main/java/com/lacunasoftware/signer/CertificateTypes.java index 0545421..8d604d9 100644 --- a/src/main/java/com/lacunasoftware/signer/CertificateTypes.java +++ b/src/main/java/com/lacunasoftware/signer/CertificateTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -51,7 +49,7 @@ public String toString() { @JsonCreator public static CertificateTypes fromValue(String input) { for (CertificateTypes b : CertificateTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/DeleteAction.java b/src/main/java/com/lacunasoftware/signer/DeleteAction.java index ecdb835..1526281 100644 --- a/src/main/java/com/lacunasoftware/signer/DeleteAction.java +++ b/src/main/java/com/lacunasoftware/signer/DeleteAction.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -43,7 +41,7 @@ public String toString() { @JsonCreator public static DeleteAction fromValue(String input) { for (DeleteAction b : DeleteAction.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/DocumentDownloadTypes.java b/src/main/java/com/lacunasoftware/signer/DocumentDownloadTypes.java index 483af5b..b47674a 100644 --- a/src/main/java/com/lacunasoftware/signer/DocumentDownloadTypes.java +++ b/src/main/java/com/lacunasoftware/signer/DocumentDownloadTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -47,7 +45,7 @@ public String toString() { @JsonCreator public static DocumentDownloadTypes fromValue(String input) { for (DocumentDownloadTypes b : DocumentDownloadTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/DocumentFilterStatus.java b/src/main/java/com/lacunasoftware/signer/DocumentFilterStatus.java index ea324a2..54fa5a3 100644 --- a/src/main/java/com/lacunasoftware/signer/DocumentFilterStatus.java +++ b/src/main/java/com/lacunasoftware/signer/DocumentFilterStatus.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -48,7 +46,7 @@ public String toString() { @JsonCreator public static DocumentFilterStatus fromValue(String input) { for (DocumentFilterStatus b : DocumentFilterStatus.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/DocumentMarkType.java b/src/main/java/com/lacunasoftware/signer/DocumentMarkType.java index e41cd3f..0a465a7 100644 --- a/src/main/java/com/lacunasoftware/signer/DocumentMarkType.java +++ b/src/main/java/com/lacunasoftware/signer/DocumentMarkType.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -44,7 +42,7 @@ public String toString() { @JsonCreator public static DocumentMarkType fromValue(String input) { for (DocumentMarkType b : DocumentMarkType.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/DocumentQueryTypes.java b/src/main/java/com/lacunasoftware/signer/DocumentQueryTypes.java index 865a68a..58dd748 100644 --- a/src/main/java/com/lacunasoftware/signer/DocumentQueryTypes.java +++ b/src/main/java/com/lacunasoftware/signer/DocumentQueryTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -46,7 +44,7 @@ public String toString() { @JsonCreator public static DocumentQueryTypes fromValue(String input) { for (DocumentQueryTypes b : DocumentQueryTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/DocumentStatus.java b/src/main/java/com/lacunasoftware/signer/DocumentStatus.java index b841bfc..ef58302 100644 --- a/src/main/java/com/lacunasoftware/signer/DocumentStatus.java +++ b/src/main/java/com/lacunasoftware/signer/DocumentStatus.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -47,7 +45,7 @@ public String toString() { @JsonCreator public static DocumentStatus fromValue(String input) { for (DocumentStatus b : DocumentStatus.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/DocumentTicketType.java b/src/main/java/com/lacunasoftware/signer/DocumentTicketType.java index 259f0a8..573fe6c 100644 --- a/src/main/java/com/lacunasoftware/signer/DocumentTicketType.java +++ b/src/main/java/com/lacunasoftware/signer/DocumentTicketType.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -47,7 +45,7 @@ public String toString() { @JsonCreator public static DocumentTicketType fromValue(String input) { for (DocumentTicketType b : DocumentTicketType.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/DocumentTypes.java b/src/main/java/com/lacunasoftware/signer/DocumentTypes.java index 69db5ca..af365ee 100644 --- a/src/main/java/com/lacunasoftware/signer/DocumentTypes.java +++ b/src/main/java/com/lacunasoftware/signer/DocumentTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -52,7 +50,7 @@ public String toString() { @JsonCreator public static DocumentTypes fromValue(String input) { for (DocumentTypes b : DocumentTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/EnumTypeAdapterFactory.java b/src/main/java/com/lacunasoftware/signer/EnumTypeAdapterFactory.java new file mode 100644 index 0000000..bc158bf --- /dev/null +++ b/src/main/java/com/lacunasoftware/signer/EnumTypeAdapterFactory.java @@ -0,0 +1,61 @@ +package com.lacunasoftware.signer; + +import com.google.gson.TypeAdapter; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.JsonParseException; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; + +import java.io.IOException; + +public class EnumTypeAdapterFactory implements TypeAdapterFactory { + + @Override + @SuppressWarnings("unchecked") + public TypeAdapter create(Gson gson, TypeToken type) { + Class rawType = type.getRawType(); + if (!rawType.isEnum()) { + return null; // Not an enum type, let Gson handle it normally + } + + return (TypeAdapter) new EnumAdapter<>((Class) rawType); + } + + private static class EnumAdapter> extends TypeAdapter { + private final Class enumType; + + public EnumAdapter(Class enumType) { + this.enumType = enumType; + } + + @Override + public void write(JsonWriter out, T value) throws IOException { + if (value == null) { + out.nullValue(); // Write null if the enum value is null + } else { + out.value(value.toString()); // Serialize using the enum's toString() + } + } + + @Override + public T read(JsonReader in) throws IOException { + if (in.peek() == com.google.gson.stream.JsonToken.NULL) { + in.nextNull(); // Gracefully handle null during deserialization + return null; + } + + String jsonValue = in.nextString(); + for (T constant : enumType.getEnumConstants()) { + if (constant.toString().equalsIgnoreCase(jsonValue.trim())) { + return constant; // Case-insensitive matching + } + } + + // Handle unknown values by throwing an exception + throw new JsonParseException("Unknown enum value: " + jsonValue); + } + } +} + diff --git a/src/main/java/com/lacunasoftware/signer/ErrorModel.java b/src/main/java/com/lacunasoftware/signer/ErrorModel.java index b2e0f47..cfff99e 100644 --- a/src/main/java/com/lacunasoftware/signer/ErrorModel.java +++ b/src/main/java/com/lacunasoftware/signer/ErrorModel.java @@ -12,28 +12,30 @@ package com.lacunasoftware.signer; +import java.util.HashMap; +import java.util.Map; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.HashMap; -import java.util.List; -import java.util.Map; /** * ErrorModel */ public class ErrorModel { - @JsonProperty("code") + @JsonProperty("code") + @SerializedName("code") private String code = null; - @JsonProperty("message") + @JsonProperty("message") + @SerializedName("message") private String message = null; - @JsonProperty("details") + @JsonProperty("details") + @SerializedName("details") private Map details = null; public ErrorModel code(String code) { diff --git a/src/main/java/com/lacunasoftware/signer/FileModel.java b/src/main/java/com/lacunasoftware/signer/FileModel.java index 7881a1a..8b1e860 100644 --- a/src/main/java/com/lacunasoftware/signer/FileModel.java +++ b/src/main/java/com/lacunasoftware/signer/FileModel.java @@ -13,28 +13,33 @@ package com.lacunasoftware.signer; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * FileModel */ public class FileModel { - @JsonProperty("location") + @JsonProperty("location") + @SerializedName("location") + private String location = null; + @JsonProperty("id") + @SerializedName("id") - @JsonProperty("id") private UUID id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("contentType") + @SerializedName("contentType") - @JsonProperty("contentType") private String contentType = null; public FileModel location(String location) { diff --git a/src/main/java/com/lacunasoftware/signer/FileUploadModel.java b/src/main/java/com/lacunasoftware/signer/FileUploadModel.java index 424d5e0..3fb67cf 100644 --- a/src/main/java/com/lacunasoftware/signer/FileUploadModel.java +++ b/src/main/java/com/lacunasoftware/signer/FileUploadModel.java @@ -13,10 +13,9 @@ package com.lacunasoftware.signer; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.javaclient.models.UploadModel; import io.swagger.v3.oas.annotations.media.Schema; @@ -26,16 +25,21 @@ public class FileUploadModel extends UploadModel{ - @JsonProperty("displayName") + @JsonProperty("displayName") + @SerializedName("displayName") + private String displayName = null; + @JsonProperty("id") + @SerializedName("id") - @JsonProperty("id") private String id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("contentType") + @SerializedName("contentType") - @JsonProperty("contentType") private String contentType = null; public FileUploadModel displayName(String displayName) { diff --git a/src/main/java/com/lacunasoftware/signer/FlowActionType.java b/src/main/java/com/lacunasoftware/signer/FlowActionType.java index efb4706..9e8ca12 100644 --- a/src/main/java/com/lacunasoftware/signer/FlowActionType.java +++ b/src/main/java/com/lacunasoftware/signer/FlowActionType.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -44,7 +42,7 @@ public String toString() { @JsonCreator public static FlowActionType fromValue(String input) { for (FlowActionType b : FlowActionType.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/FolderType.java b/src/main/java/com/lacunasoftware/signer/FolderType.java index 223cada..36a9d0b 100644 --- a/src/main/java/com/lacunasoftware/signer/FolderType.java +++ b/src/main/java/com/lacunasoftware/signer/FolderType.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -43,7 +41,7 @@ public String toString() { @JsonCreator public static FolderType fromValue(String input) { for (FolderType b : FolderType.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/InvoicesUpdateInvoicePaymentStatusRequest.java b/src/main/java/com/lacunasoftware/signer/InvoicesUpdateInvoicePaymentStatusRequest.java index 609dc64..6b3786d 100644 --- a/src/main/java/com/lacunasoftware/signer/InvoicesUpdateInvoicePaymentStatusRequest.java +++ b/src/main/java/com/lacunasoftware/signer/InvoicesUpdateInvoicePaymentStatusRequest.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * InvoicesUpdateInvoicePaymentStatusRequest @@ -24,7 +24,8 @@ public class InvoicesUpdateInvoicePaymentStatusRequest { - @JsonProperty("isPaid") + @JsonProperty("isPaid") + @SerializedName("isPaid") private Boolean isPaid = null; public InvoicesUpdateInvoicePaymentStatusRequest isPaid(Boolean isPaid) { diff --git a/src/main/java/com/lacunasoftware/signer/NotarizationStatus.java b/src/main/java/com/lacunasoftware/signer/NotarizationStatus.java index 688f06a..1db95d5 100644 --- a/src/main/java/com/lacunasoftware/signer/NotarizationStatus.java +++ b/src/main/java/com/lacunasoftware/signer/NotarizationStatus.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -44,7 +42,7 @@ public String toString() { @JsonCreator public static NotarizationStatus fromValue(String input) { for (NotarizationStatus b : NotarizationStatus.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/NotaryTypes.java b/src/main/java/com/lacunasoftware/signer/NotaryTypes.java index dadc537..9ceeb30 100644 --- a/src/main/java/com/lacunasoftware/signer/NotaryTypes.java +++ b/src/main/java/com/lacunasoftware/signer/NotaryTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -43,7 +41,7 @@ public String toString() { @JsonCreator public static NotaryTypes fromValue(String input) { for (NotaryTypes b : NotaryTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/OrganizationType.java b/src/main/java/com/lacunasoftware/signer/OrganizationType.java index 2c0fd39..5ddfdb8 100644 --- a/src/main/java/com/lacunasoftware/signer/OrganizationType.java +++ b/src/main/java/com/lacunasoftware/signer/OrganizationType.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -44,7 +42,7 @@ public String toString() { @JsonCreator public static OrganizationType fromValue(String input) { for (OrganizationType b : OrganizationType.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/PaginatedSearchResponseDocumentFlowModel.java b/src/main/java/com/lacunasoftware/signer/PaginatedSearchResponseDocumentFlowModel.java index 154fad8..82a1cfa 100644 --- a/src/main/java/com/lacunasoftware/signer/PaginatedSearchResponseDocumentFlowModel.java +++ b/src/main/java/com/lacunasoftware/signer/PaginatedSearchResponseDocumentFlowModel.java @@ -12,30 +12,34 @@ package com.lacunasoftware.signer; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.documentflows.DocumentFlowModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * PaginatedSearchResponseDocumentFlowModel */ public class PaginatedSearchResponseDocumentFlowModel { - @JsonProperty("items") + @JsonProperty("items") + @SerializedName("items") private List items = null; - @JsonProperty("totalCount") + @JsonProperty("totalCount") + @SerializedName("totalCount") private Integer totalCount = null; - @JsonProperty("nextCursor") + @JsonProperty("nextCursor") + @SerializedName("nextCursor") private String nextCursor = null; + public PaginatedSearchResponseDocumentFlowModel items(List items) { this.items = items; return this; diff --git a/src/main/java/com/lacunasoftware/signer/PaginatedSearchResponseDocumentListModel.java b/src/main/java/com/lacunasoftware/signer/PaginatedSearchResponseDocumentListModel.java index 60eed8e..cc99c2a 100644 --- a/src/main/java/com/lacunasoftware/signer/PaginatedSearchResponseDocumentListModel.java +++ b/src/main/java/com/lacunasoftware/signer/PaginatedSearchResponseDocumentListModel.java @@ -12,30 +12,34 @@ package com.lacunasoftware.signer; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.documents.DocumentListModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * PaginatedSearchResponseDocumentListModel */ public class PaginatedSearchResponseDocumentListModel { - @JsonProperty("items") + @JsonProperty("items") + @SerializedName("items") private List items = null; - @JsonProperty("totalCount") + @JsonProperty("totalCount") + @SerializedName("totalCount") private Integer totalCount = null; - @JsonProperty("nextCursor") + @JsonProperty("nextCursor") + @SerializedName("nextCursor") private String nextCursor = null; + public PaginatedSearchResponseDocumentListModel items(List items) { this.items = items; return this; diff --git a/src/main/java/com/lacunasoftware/signer/PaginatedSearchResponseFolderInfoModel.java b/src/main/java/com/lacunasoftware/signer/PaginatedSearchResponseFolderInfoModel.java index 13397ae..94724bc 100644 --- a/src/main/java/com/lacunasoftware/signer/PaginatedSearchResponseFolderInfoModel.java +++ b/src/main/java/com/lacunasoftware/signer/PaginatedSearchResponseFolderInfoModel.java @@ -12,29 +12,32 @@ package com.lacunasoftware.signer; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.folders.FolderInfoModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * PaginatedSearchResponseFolderInfoModel */ public class PaginatedSearchResponseFolderInfoModel { - @JsonProperty("items") + @JsonProperty("items") + @SerializedName("items") private List items = null; - @JsonProperty("totalCount") - private Integer totalCount = null; - - @JsonProperty("nextCursor") - private String nextCursor = null; + @JsonProperty("totalCount") + @SerializedName("totalCount") + private Integer totalCount = null; + + @JsonProperty("nextCursor") + @SerializedName("nextCursor") + private String nextCursor = null; public PaginatedSearchResponseFolderInfoModel items(List items) { this.items = items; diff --git a/src/main/java/com/lacunasoftware/signer/PaginationOrders.java b/src/main/java/com/lacunasoftware/signer/PaginationOrders.java index 9950fa6..acc91e0 100644 --- a/src/main/java/com/lacunasoftware/signer/PaginationOrders.java +++ b/src/main/java/com/lacunasoftware/signer/PaginationOrders.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -43,7 +41,7 @@ public String toString() { @JsonCreator public static PaginationOrders fromValue(String input) { for (PaginationOrders b : PaginationOrders.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/ParticipantQueryTypes.java b/src/main/java/com/lacunasoftware/signer/ParticipantQueryTypes.java index 8e1e082..c28b69f 100644 --- a/src/main/java/com/lacunasoftware/signer/ParticipantQueryTypes.java +++ b/src/main/java/com/lacunasoftware/signer/ParticipantQueryTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -45,7 +43,7 @@ public String toString() { @JsonCreator public static ParticipantQueryTypes fromValue(String input) { for (ParticipantQueryTypes b : ParticipantQueryTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/Probability.java b/src/main/java/com/lacunasoftware/signer/Probability.java index 9176ecd..fba77f4 100644 --- a/src/main/java/com/lacunasoftware/signer/Probability.java +++ b/src/main/java/com/lacunasoftware/signer/Probability.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -45,7 +43,7 @@ public String toString() { @JsonCreator public static Probability fromValue(String input) { for (Probability b : Probability.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/SignatureInitialsModes.java b/src/main/java/com/lacunasoftware/signer/SignatureInitialsModes.java index 9966834..31bde84 100644 --- a/src/main/java/com/lacunasoftware/signer/SignatureInitialsModes.java +++ b/src/main/java/com/lacunasoftware/signer/SignatureInitialsModes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -44,7 +42,7 @@ public String toString() { @JsonCreator public static SignatureInitialsModes fromValue(String input) { for (SignatureInitialsModes b : SignatureInitialsModes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/SignatureTypes.java b/src/main/java/com/lacunasoftware/signer/SignatureTypes.java index 256930a..85ec705 100644 --- a/src/main/java/com/lacunasoftware/signer/SignatureTypes.java +++ b/src/main/java/com/lacunasoftware/signer/SignatureTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -45,7 +43,7 @@ public String toString() { @JsonCreator public static SignatureTypes fromValue(String input) { for (SignatureTypes b : SignatureTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/SignerModel.java b/src/main/java/com/lacunasoftware/signer/SignerModel.java index efc44e3..61f43e7 100644 --- a/src/main/java/com/lacunasoftware/signer/SignerModel.java +++ b/src/main/java/com/lacunasoftware/signer/SignerModel.java @@ -12,62 +12,76 @@ package com.lacunasoftware.signer; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.certificates.AttributeCertificateInfoModel; import com.lacunasoftware.signer.signature.EvidencesModel; -import com.lacunasoftware.signer.ValidationResultsModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; -import org.threeten.bp.OffsetDateTime; /** * SignerModel */ public class SignerModel { - @JsonProperty("subjectName") + @JsonProperty("subjectName") + @SerializedName("subjectName") private String subjectName = null; - - @JsonProperty("emailAddress") + + @JsonProperty("emailAddress") + @SerializedName("emailAddress") private String emailAddress = null; - - @JsonProperty("issuerName") + + @JsonProperty("issuerName") + @SerializedName("issuerName") private String issuerName = null; - - @JsonProperty("identifier") + + @JsonProperty("identifier") + @SerializedName("identifier") private String identifier = null; - - @JsonProperty("companyName") + + @JsonProperty("companyName") + @SerializedName("companyName") private String companyName = null; - - @JsonProperty("companyIdentifier") + + @JsonProperty("companyIdentifier") + @SerializedName("companyIdentifier") private String companyIdentifier = null; - - @JsonProperty("isElectronic") + + @JsonProperty("isElectronic") + @SerializedName("isElectronic") private Boolean isElectronic = null; - - @JsonProperty("isTimestamp") + + @JsonProperty("isTimestamp") + @SerializedName("isTimestamp") private Boolean isTimestamp = null; - - @JsonProperty("signingTime") + + @JsonProperty("signingTime") + @SerializedName("signingTime") private OffsetDateTime signingTime = null; - - @JsonProperty("certificateThumbprint") + + @JsonProperty("certificateThumbprint") + @SerializedName("certificateThumbprint") private String certificateThumbprint = null; - - @JsonProperty("evidences") + + @JsonProperty("evidences") + @SerializedName("evidences") private EvidencesModel evidences = null; - - @JsonProperty("attributeCertificates") + + @JsonProperty("attributeCertificates") + @SerializedName("attributeCertificates") private List attributeCertificates = null; - - @JsonProperty("validationResults") + + @JsonProperty("validationResults") + @SerializedName("validationResults") private ValidationResultsModel validationResults = null; + public SignerModel subjectName(String subjectName) { this.subjectName = subjectName; diff --git a/src/main/java/com/lacunasoftware/signer/TicketModel.java b/src/main/java/com/lacunasoftware/signer/TicketModel.java index 181ae58..ba98c74 100644 --- a/src/main/java/com/lacunasoftware/signer/TicketModel.java +++ b/src/main/java/com/lacunasoftware/signer/TicketModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * TicketModel @@ -24,7 +24,8 @@ public class TicketModel { - @JsonProperty("location") + @JsonProperty("location") + @SerializedName("location") private String location = null; public TicketModel location(String location) { diff --git a/src/main/java/com/lacunasoftware/signer/TransactionPricingTypes.java b/src/main/java/com/lacunasoftware/signer/TransactionPricingTypes.java index eec4622..bdfdf90 100644 --- a/src/main/java/com/lacunasoftware/signer/TransactionPricingTypes.java +++ b/src/main/java/com/lacunasoftware/signer/TransactionPricingTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -44,7 +42,7 @@ public String toString() { @JsonCreator public static TransactionPricingTypes fromValue(String input) { for (TransactionPricingTypes b : TransactionPricingTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/TransactionTypes.java b/src/main/java/com/lacunasoftware/signer/TransactionTypes.java index e0ace41..d16672a 100644 --- a/src/main/java/com/lacunasoftware/signer/TransactionTypes.java +++ b/src/main/java/com/lacunasoftware/signer/TransactionTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -51,7 +49,7 @@ public String toString() { @JsonCreator public static TransactionTypes fromValue(String input) { for (TransactionTypes b : TransactionTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/ValidationItemModel.java b/src/main/java/com/lacunasoftware/signer/ValidationItemModel.java index 0202b13..8926993 100644 --- a/src/main/java/com/lacunasoftware/signer/ValidationItemModel.java +++ b/src/main/java/com/lacunasoftware/signer/ValidationItemModel.java @@ -13,11 +13,10 @@ package com.lacunasoftware.signer; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.ValidationResultsModel; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * ValidationItemModel @@ -25,18 +24,23 @@ public class ValidationItemModel { - @JsonProperty("type") + @JsonProperty("type") + @SerializedName("type") private String type = null; - @JsonProperty("message") + @JsonProperty("message") + @SerializedName("message") private String message = null; - @JsonProperty("detail") + @JsonProperty("detail") + @SerializedName("detail") private String detail = null; - @JsonProperty("innerValidationResults") + @JsonProperty("innerValidationResults") + @SerializedName("innerValidationResults") private ValidationResultsModel innerValidationResults = null; + public ValidationItemModel type(String type) { this.type = type; return this; diff --git a/src/main/java/com/lacunasoftware/signer/ValidationResultsModel.java b/src/main/java/com/lacunasoftware/signer/ValidationResultsModel.java index 4d167fa..27b9f11 100644 --- a/src/main/java/com/lacunasoftware/signer/ValidationResultsModel.java +++ b/src/main/java/com/lacunasoftware/signer/ValidationResultsModel.java @@ -12,31 +12,34 @@ package com.lacunasoftware.signer; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.ValidationItemModel; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * ValidationResultsModel */ public class ValidationResultsModel { - @JsonProperty("passedChecks") + @JsonProperty("passedChecks") + @SerializedName("passedChecks") private List passedChecks = null; - @JsonProperty("errors") + @JsonProperty("errors") + @SerializedName("errors") private List errors = null; - @JsonProperty("warnings") + @JsonProperty("warnings") + @SerializedName("warnings") private List warnings = null; - @JsonProperty("isValid") + @JsonProperty("isValid") + @SerializedName("isValid") private Boolean isValid = null; public ValidationResultsModel passedChecks(List passedChecks) { diff --git a/src/main/java/com/lacunasoftware/signer/WebhookTypes.java b/src/main/java/com/lacunasoftware/signer/WebhookTypes.java index fa99f71..8515cfd 100644 --- a/src/main/java/com/lacunasoftware/signer/WebhookTypes.java +++ b/src/main/java/com/lacunasoftware/signer/WebhookTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -49,7 +47,7 @@ public String toString() { @JsonCreator public static WebhookTypes fromValue(String input) { for (WebhookTypes b : WebhookTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/XadesElementIdentifierTypes.java b/src/main/java/com/lacunasoftware/signer/XadesElementIdentifierTypes.java index a9e60c9..b4f150a 100644 --- a/src/main/java/com/lacunasoftware/signer/XadesElementIdentifierTypes.java +++ b/src/main/java/com/lacunasoftware/signer/XadesElementIdentifierTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -43,7 +41,7 @@ public String toString() { @JsonCreator public static XadesElementIdentifierTypes fromValue(String input) { for (XadesElementIdentifierTypes b : XadesElementIdentifierTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/XadesInsertionOptions.java b/src/main/java/com/lacunasoftware/signer/XadesInsertionOptions.java index a40e245..1560a17 100644 --- a/src/main/java/com/lacunasoftware/signer/XadesInsertionOptions.java +++ b/src/main/java/com/lacunasoftware/signer/XadesInsertionOptions.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -45,7 +43,7 @@ public String toString() { @JsonCreator public static XadesInsertionOptions fromValue(String input) { for (XadesInsertionOptions b : XadesInsertionOptions.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/XadesSignatureTypes.java b/src/main/java/com/lacunasoftware/signer/XadesSignatureTypes.java index c464c2b..152a40a 100644 --- a/src/main/java/com/lacunasoftware/signer/XadesSignatureTypes.java +++ b/src/main/java/com/lacunasoftware/signer/XadesSignatureTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -44,7 +42,7 @@ public String toString() { @JsonCreator public static XadesSignatureTypes fromValue(String input) { for (XadesSignatureTypes b : XadesSignatureTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/XmlNamespaceModel.java b/src/main/java/com/lacunasoftware/signer/XmlNamespaceModel.java index e45f108..dee7776 100644 --- a/src/main/java/com/lacunasoftware/signer/XmlNamespaceModel.java +++ b/src/main/java/com/lacunasoftware/signer/XmlNamespaceModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * XmlNamespaceModel @@ -24,10 +24,13 @@ public class XmlNamespaceModel { - @JsonProperty("prefix") + @JsonProperty("prefix") + @SerializedName("prefix") + private String prefix = null; + @JsonProperty("uri") + @SerializedName("uri") - @JsonProperty("uri") private String uri = null; public XmlNamespaceModel prefix(String prefix) { diff --git a/src/main/java/com/lacunasoftware/signer/agents/AgentModel.java b/src/main/java/com/lacunasoftware/signer/agents/AgentModel.java index e230f95..2c3363a 100644 --- a/src/main/java/com/lacunasoftware/signer/agents/AgentModel.java +++ b/src/main/java/com/lacunasoftware/signer/agents/AgentModel.java @@ -13,26 +13,30 @@ package com.lacunasoftware.signer.agents; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.AgentTypes; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * AgentModel */ public class AgentModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private UUID id = null; + @JsonProperty("type") + @SerializedName("type") - @JsonProperty("type") private AgentTypes type = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; public AgentModel id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/applications/ApplicationDisplayModel.java b/src/main/java/com/lacunasoftware/signer/applications/ApplicationDisplayModel.java index bcbed73..a7e6d23 100644 --- a/src/main/java/com/lacunasoftware/signer/applications/ApplicationDisplayModel.java +++ b/src/main/java/com/lacunasoftware/signer/applications/ApplicationDisplayModel.java @@ -13,25 +13,29 @@ package com.lacunasoftware.signer.applications; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * ApplicationDisplayModel */ public class ApplicationDisplayModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private UUID id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("organizationName") + @SerializedName("organizationName") - @JsonProperty("organizationName") private String organizationName = null; public ApplicationDisplayModel id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/attachments/AttachmentModel.java b/src/main/java/com/lacunasoftware/signer/attachments/AttachmentModel.java index ea8892a..4ff5376 100644 --- a/src/main/java/com/lacunasoftware/signer/attachments/AttachmentModel.java +++ b/src/main/java/com/lacunasoftware/signer/attachments/AttachmentModel.java @@ -13,45 +13,56 @@ package com.lacunasoftware.signer.attachments; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.documents.CreatorModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; -import org.threeten.bp.OffsetDateTime; /** * AttachmentModel */ public class AttachmentModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private UUID id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("filename") + @SerializedName("filename") - @JsonProperty("filename") private String filename = null; + @JsonProperty("fileSize") + @SerializedName("fileSize") - @JsonProperty("fileSize") private Long fileSize = null; + @JsonProperty("mimeType") + @SerializedName("mimeType") - @JsonProperty("mimeType") private String mimeType = null; + @JsonProperty("creationDate") + @SerializedName("creationDate") - @JsonProperty("creationDate") private OffsetDateTime creationDate = null; + @JsonProperty("updateDate") + @SerializedName("updateDate") - @JsonProperty("updateDate") private OffsetDateTime updateDate = null; + @JsonProperty("createdBy") + @SerializedName("createdBy") - @JsonProperty("createdBy") private CreatorModel createdBy = null; + @JsonProperty("isPrivate") + @SerializedName("isPrivate") - @JsonProperty("isPrivate") private Boolean isPrivate = null; public AttachmentModel id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/attachments/AttachmentUploadModel.java b/src/main/java/com/lacunasoftware/signer/attachments/AttachmentUploadModel.java index 8fd31b1..91bfaeb 100644 --- a/src/main/java/com/lacunasoftware/signer/attachments/AttachmentUploadModel.java +++ b/src/main/java/com/lacunasoftware/signer/attachments/AttachmentUploadModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.attachments; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * AttachmentUploadModel @@ -24,19 +24,25 @@ public class AttachmentUploadModel { - @JsonProperty("isPrivate") + @JsonProperty("isPrivate") + @SerializedName("isPrivate") + private Boolean isPrivate = null; + @JsonProperty("displayName") + @SerializedName("displayName") - @JsonProperty("displayName") private String displayName = null; + @JsonProperty("id") + @SerializedName("id") - @JsonProperty("id") private String id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("contentType") + @SerializedName("contentType") - @JsonProperty("contentType") private String contentType = null; public AttachmentUploadModel isPrivate(Boolean isPrivate) { diff --git a/src/main/java/com/lacunasoftware/signer/attachments/CreateAttachmentResult.java b/src/main/java/com/lacunasoftware/signer/attachments/CreateAttachmentResult.java index d489d84..955ed39 100644 --- a/src/main/java/com/lacunasoftware/signer/attachments/CreateAttachmentResult.java +++ b/src/main/java/com/lacunasoftware/signer/attachments/CreateAttachmentResult.java @@ -13,22 +13,25 @@ package com.lacunasoftware.signer.attachments; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * CreateAttachmentResult */ public class CreateAttachmentResult { - @JsonProperty("uploadId") + @JsonProperty("uploadId") + @SerializedName("uploadId") + private String uploadId = null; + @JsonProperty("attachmentId") + @SerializedName("attachmentId") - @JsonProperty("attachmentId") private UUID attachmentId = null; public CreateAttachmentResult uploadId(String uploadId) { diff --git a/src/main/java/com/lacunasoftware/signer/billing/BillingInformationModel.java b/src/main/java/com/lacunasoftware/signer/billing/BillingInformationModel.java index ab8d319..40ee57e 100644 --- a/src/main/java/com/lacunasoftware/signer/billing/BillingInformationModel.java +++ b/src/main/java/com/lacunasoftware/signer/billing/BillingInformationModel.java @@ -13,12 +13,8 @@ package com.lacunasoftware.signer.billing; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.billing.CompanyBillingInformationModel; -import com.lacunasoftware.signer.billing.IndividualBillingInformationModel; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.BillingInformationTypes; import io.swagger.v3.oas.annotations.media.Schema; /** @@ -27,52 +23,69 @@ public class BillingInformationModel { - @JsonProperty("contactName") + @JsonProperty("contactName") + @SerializedName("contactName") + private String contactName = null; + @JsonProperty("email") + @SerializedName("email") - @JsonProperty("email") private String email = null; + @JsonProperty("phone") + @SerializedName("phone") - @JsonProperty("phone") private String phone = null; + @JsonProperty("type") + @SerializedName("type") - @JsonProperty("type") private BillingInformationTypes type = null; + @JsonProperty("individual") + @SerializedName("individual") - @JsonProperty("individual") private IndividualBillingInformationModel individual = null; + @JsonProperty("company") + @SerializedName("company") - @JsonProperty("company") private CompanyBillingInformationModel company = null; + @JsonProperty("streetAddress") + @SerializedName("streetAddress") - @JsonProperty("streetAddress") private String streetAddress = null; + @JsonProperty("addressNumber") + @SerializedName("addressNumber") - @JsonProperty("addressNumber") private String addressNumber = null; + @JsonProperty("additionalAddressInfo") + @SerializedName("additionalAddressInfo") - @JsonProperty("additionalAddressInfo") private String additionalAddressInfo = null; + @JsonProperty("neighborhood") + @SerializedName("neighborhood") - @JsonProperty("neighborhood") private String neighborhood = null; + @JsonProperty("address") + @SerializedName("address") - @JsonProperty("address") private String address = null; + @JsonProperty("address2") + @SerializedName("address2") - @JsonProperty("address2") private String address2 = null; + @JsonProperty("zipCode") + @SerializedName("zipCode") - @JsonProperty("zipCode") private String zipCode = null; + @JsonProperty("city") + @SerializedName("city") - @JsonProperty("city") private String city = null; + @JsonProperty("state") + @SerializedName("state") - @JsonProperty("state") private String state = null; + @JsonProperty("cityCode") + @SerializedName("cityCode") - @JsonProperty("cityCode") private String cityCode = null; public BillingInformationModel contactName(String contactName) { diff --git a/src/main/java/com/lacunasoftware/signer/billing/CompanyBillingInformationModel.java b/src/main/java/com/lacunasoftware/signer/billing/CompanyBillingInformationModel.java index bcaa6a7..d94b566 100644 --- a/src/main/java/com/lacunasoftware/signer/billing/CompanyBillingInformationModel.java +++ b/src/main/java/com/lacunasoftware/signer/billing/CompanyBillingInformationModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.billing; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * CompanyBillingInformationModel @@ -24,22 +24,29 @@ public class CompanyBillingInformationModel { - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") + private String name = null; + @JsonProperty("identifier") + @SerializedName("identifier") - @JsonProperty("identifier") private String identifier = null; + @JsonProperty("stateRegistration") + @SerializedName("stateRegistration") - @JsonProperty("stateRegistration") private String stateRegistration = null; + @JsonProperty("stateRegistrationExempt") + @SerializedName("stateRegistrationExempt") - @JsonProperty("stateRegistrationExempt") private Boolean stateRegistrationExempt = null; + @JsonProperty("municipalRegistration") + @SerializedName("municipalRegistration") - @JsonProperty("municipalRegistration") private String municipalRegistration = null; + @JsonProperty("municipalRegistrationExempt") + @SerializedName("municipalRegistrationExempt") - @JsonProperty("municipalRegistrationExempt") private Boolean municipalRegistrationExempt = null; public CompanyBillingInformationModel name(String name) { diff --git a/src/main/java/com/lacunasoftware/signer/billing/IndividualBillingInformationModel.java b/src/main/java/com/lacunasoftware/signer/billing/IndividualBillingInformationModel.java index c12a083..80cae7c 100644 --- a/src/main/java/com/lacunasoftware/signer/billing/IndividualBillingInformationModel.java +++ b/src/main/java/com/lacunasoftware/signer/billing/IndividualBillingInformationModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.billing; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * IndividualBillingInformationModel @@ -24,10 +24,13 @@ public class IndividualBillingInformationModel { - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") + private String name = null; + @JsonProperty("identifier") + @SerializedName("identifier") - @JsonProperty("identifier") private String identifier = null; public IndividualBillingInformationModel name(String name) { diff --git a/src/main/java/com/lacunasoftware/signer/certificates/AttributeCertificateInfoModel.java b/src/main/java/com/lacunasoftware/signer/certificates/AttributeCertificateInfoModel.java index 3f84c1d..bb15c2a 100644 --- a/src/main/java/com/lacunasoftware/signer/certificates/AttributeCertificateInfoModel.java +++ b/src/main/java/com/lacunasoftware/signer/certificates/AttributeCertificateInfoModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.certificates; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * AttributeCertificateInfoModel @@ -24,10 +24,13 @@ public class AttributeCertificateInfoModel { - @JsonProperty("details") + @JsonProperty("details") + @SerializedName("details") + private String details = null; + @JsonProperty("issuer") + @SerializedName("issuer") - @JsonProperty("issuer") private String issuer = null; public AttributeCertificateInfoModel details(String details) { diff --git a/src/main/java/com/lacunasoftware/signer/certificates/CertificateHolderTypes.java b/src/main/java/com/lacunasoftware/signer/certificates/CertificateHolderTypes.java index c5b1ad0..067ae1e 100644 --- a/src/main/java/com/lacunasoftware/signer/certificates/CertificateHolderTypes.java +++ b/src/main/java/com/lacunasoftware/signer/certificates/CertificateHolderTypes.java @@ -12,8 +12,6 @@ package com.lacunasoftware.signer.certificates; -import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -43,7 +41,7 @@ public String toString() { @JsonCreator public static CertificateHolderTypes fromValue(String input) { for (CertificateHolderTypes b : CertificateHolderTypes.values()) { - if (b.value.equals(input)) { + if (b.value.equalsIgnoreCase(input)) { return b; } } diff --git a/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowCreateRequest.java b/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowCreateRequest.java index 26fa26f..74d9ac6 100644 --- a/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowCreateRequest.java +++ b/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowCreateRequest.java @@ -12,32 +12,37 @@ package com.lacunasoftware.signer.documentflows; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.flowactions.FlowActionCreateModel; import com.lacunasoftware.signer.observers.ObserverCreateModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * DocumentFlowCreateRequest */ public class DocumentFlowCreateRequest { - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") + private String name = null; + @JsonProperty("areActionsOrdered") + @SerializedName("areActionsOrdered") - @JsonProperty("areActionsOrdered") private Boolean areActionsOrdered = null; + @JsonProperty("flowActions") + @SerializedName("flowActions") - @JsonProperty("flowActions") private List flowActions = new ArrayList(); + @JsonProperty("observers") + @SerializedName("observers") - @JsonProperty("observers") private List observers = null; public DocumentFlowCreateRequest name(String name) { diff --git a/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowData.java b/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowData.java index 35b017a..7de41e9 100644 --- a/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowData.java +++ b/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowData.java @@ -12,32 +12,37 @@ package com.lacunasoftware.signer.documentflows; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.flowactions.FlowActionCreateModel; import com.lacunasoftware.signer.observers.ObserverCreateModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * DocumentFlowData */ public class DocumentFlowData { - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") + private String name = null; + @JsonProperty("areActionsOrdered") + @SerializedName("areActionsOrdered") - @JsonProperty("areActionsOrdered") private Boolean areActionsOrdered = null; + @JsonProperty("flowActions") + @SerializedName("flowActions") - @JsonProperty("flowActions") private List flowActions = new ArrayList(); + @JsonProperty("observers") + @SerializedName("observers") - @JsonProperty("observers") private List observers = null; public DocumentFlowData name(String name) { diff --git a/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowDetailsModel.java b/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowDetailsModel.java index 61fb355..6f20c12 100644 --- a/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowDetailsModel.java +++ b/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowDetailsModel.java @@ -12,47 +12,57 @@ package com.lacunasoftware.signer.documentflows; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.documents.CreatorModel; import com.lacunasoftware.signer.flowactions.FlowActionCreateModel; import com.lacunasoftware.signer.observers.ObserverCreateModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import org.threeten.bp.OffsetDateTime; /** * DocumentFlowDetailsModel */ public class DocumentFlowDetailsModel { - @JsonProperty("areActionsOrdered") + @JsonProperty("areActionsOrdered") + @SerializedName("areActionsOrdered") + private Boolean areActionsOrdered = null; + @JsonProperty("flowActions") + @SerializedName("flowActions") - @JsonProperty("flowActions") private List flowActions = null; + @JsonProperty("observers") + @SerializedName("observers") - @JsonProperty("observers") private List observers = null; + @JsonProperty("id") + @SerializedName("id") - @JsonProperty("id") private UUID id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("creationDate") + @SerializedName("creationDate") - @JsonProperty("creationDate") private OffsetDateTime creationDate = null; + @JsonProperty("updateDate") + @SerializedName("updateDate") - @JsonProperty("updateDate") private OffsetDateTime updateDate = null; + @JsonProperty("createdBy") + @SerializedName("createdBy") - @JsonProperty("createdBy") private CreatorModel createdBy = null; public DocumentFlowDetailsModel areActionsOrdered(Boolean areActionsOrdered) { diff --git a/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowModel.java b/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowModel.java index aff1fc7..30617b2 100644 --- a/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowModel.java +++ b/src/main/java/com/lacunasoftware/signer/documentflows/DocumentFlowModel.java @@ -13,33 +13,40 @@ package com.lacunasoftware.signer.documentflows; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.documents.CreatorModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; -import org.threeten.bp.OffsetDateTime; /** * DocumentFlowModel */ public class DocumentFlowModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private UUID id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("creationDate") + @SerializedName("creationDate") - @JsonProperty("creationDate") private OffsetDateTime creationDate = null; + @JsonProperty("updateDate") + @SerializedName("updateDate") - @JsonProperty("updateDate") private OffsetDateTime updateDate = null; + @JsonProperty("createdBy") + @SerializedName("createdBy") - @JsonProperty("createdBy") private CreatorModel createdBy = null; public DocumentFlowModel id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/documentmark/DocumentMarkPositionModel.java b/src/main/java/com/lacunasoftware/signer/documentmark/DocumentMarkPositionModel.java index e09939b..c312a29 100644 --- a/src/main/java/com/lacunasoftware/signer/documentmark/DocumentMarkPositionModel.java +++ b/src/main/java/com/lacunasoftware/signer/documentmark/DocumentMarkPositionModel.java @@ -13,10 +13,8 @@ package com.lacunasoftware.signer.documentmark; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.DocumentMarkType; import io.swagger.v3.oas.annotations.media.Schema; /** @@ -25,22 +23,29 @@ public class DocumentMarkPositionModel { - @JsonProperty("topLeftX") + @JsonProperty("topLeftX") + @SerializedName("topLeftX") + private Double topLeftX = null; + @JsonProperty("topLeftY") + @SerializedName("topLeftY") - @JsonProperty("topLeftY") private Double topLeftY = null; + @JsonProperty("width") + @SerializedName("width") - @JsonProperty("width") private Double width = null; + @JsonProperty("height") + @SerializedName("height") - @JsonProperty("height") private Double height = null; + @JsonProperty("pageNumber") + @SerializedName("pageNumber") - @JsonProperty("pageNumber") private Integer pageNumber = null; + @JsonProperty("type") + @SerializedName("type") - @JsonProperty("type") private DocumentMarkType type = null; public DocumentMarkPositionModel topLeftX(Double topLeftX) { diff --git a/src/main/java/com/lacunasoftware/signer/documentmark/FlowActionPositionModel.java b/src/main/java/com/lacunasoftware/signer/documentmark/FlowActionPositionModel.java index 04bc451..4a99c3c 100644 --- a/src/main/java/com/lacunasoftware/signer/documentmark/FlowActionPositionModel.java +++ b/src/main/java/com/lacunasoftware/signer/documentmark/FlowActionPositionModel.java @@ -12,43 +12,50 @@ package com.lacunasoftware.signer.documentmark; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.documentmark.PrePositionedDocumentMarkModel; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.FlowActionType; import com.lacunasoftware.signer.SignatureInitialsModes; import com.lacunasoftware.signer.users.ParticipantUserModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * FlowActionPositionModel */ public class FlowActionPositionModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private String id = null; + @JsonProperty("type") + @SerializedName("type") - @JsonProperty("type") private FlowActionType type = null; + @JsonProperty("user") + @SerializedName("user") - @JsonProperty("user") private ParticipantUserModel user = null; + @JsonProperty("signatureInitialsMode") + @SerializedName("signatureInitialsMode") - @JsonProperty("signatureInitialsMode") private SignatureInitialsModes signatureInitialsMode = null; + @JsonProperty("ruleName") + @SerializedName("ruleName") - @JsonProperty("ruleName") private String ruleName = null; + @JsonProperty("numberRequiredSignatures") + @SerializedName("numberRequiredSignatures") - @JsonProperty("numberRequiredSignatures") private Integer numberRequiredSignatures = null; + @JsonProperty("prePositionedMarks") + @SerializedName("prePositionedMarks") - @JsonProperty("prePositionedMarks") private List prePositionedMarks = null; public FlowActionPositionModel id(String id) { diff --git a/src/main/java/com/lacunasoftware/signer/documentmark/MarksSessionCreateRequest.java b/src/main/java/com/lacunasoftware/signer/documentmark/MarksSessionCreateRequest.java index 4e51009..5ab9960 100644 --- a/src/main/java/com/lacunasoftware/signer/documentmark/MarksSessionCreateRequest.java +++ b/src/main/java/com/lacunasoftware/signer/documentmark/MarksSessionCreateRequest.java @@ -13,11 +13,8 @@ package com.lacunasoftware.signer.documentmark; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.documentmark.FlowActionPositionModel; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.SignatureTypes; import com.lacunasoftware.signer.javaclient.models.UploadModel; import io.swagger.v3.oas.annotations.media.Schema; @@ -29,16 +26,21 @@ public class MarksSessionCreateRequest { - @JsonProperty("files") + @JsonProperty("files") + @SerializedName("files") + private List files = new ArrayList(); + @JsonProperty("isEnvelope") + @SerializedName("isEnvelope") - @JsonProperty("isEnvelope") private Boolean isEnvelope = null; + @JsonProperty("flowActions") + @SerializedName("flowActions") - @JsonProperty("flowActions") private List flowActions = new ArrayList(); + @JsonProperty("signatureType") + @SerializedName("signatureType") - @JsonProperty("signatureType") private SignatureTypes signatureType = null; public MarksSessionCreateRequest files(List files) { diff --git a/src/main/java/com/lacunasoftware/signer/documentmark/MarksSessionCreateResponse.java b/src/main/java/com/lacunasoftware/signer/documentmark/MarksSessionCreateResponse.java index d1a5ce6..6222a6b 100644 --- a/src/main/java/com/lacunasoftware/signer/documentmark/MarksSessionCreateResponse.java +++ b/src/main/java/com/lacunasoftware/signer/documentmark/MarksSessionCreateResponse.java @@ -13,10 +13,9 @@ package com.lacunasoftware.signer.documentmark; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; import java.util.UUID; /** @@ -25,10 +24,13 @@ public class MarksSessionCreateResponse { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private UUID id = null; + @JsonProperty("embedUrl") + @SerializedName("embedUrl") - @JsonProperty("embedUrl") private String embedUrl = null; public MarksSessionCreateResponse id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/documentmark/MarksSessionModel.java b/src/main/java/com/lacunasoftware/signer/documentmark/MarksSessionModel.java index f30007e..53c64da 100644 --- a/src/main/java/com/lacunasoftware/signer/documentmark/MarksSessionModel.java +++ b/src/main/java/com/lacunasoftware/signer/documentmark/MarksSessionModel.java @@ -13,11 +13,8 @@ package com.lacunasoftware.signer.documentmark; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.documentmark.UploadTicketModel; +import com.google.gson.annotations.SerializedName; import io.swagger.v3.oas.annotations.media.Schema; import java.util.ArrayList; import java.util.List; @@ -28,13 +25,17 @@ public class MarksSessionModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private UUID id = null; + @JsonProperty("files") + @SerializedName("files") - @JsonProperty("files") private List files = null; + @JsonProperty("data") + @SerializedName("data") - @JsonProperty("data") private Object data = null; public MarksSessionModel id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/documentmark/PrePositionedDocumentMarkModel.java b/src/main/java/com/lacunasoftware/signer/documentmark/PrePositionedDocumentMarkModel.java index 847369a..a40ebfe 100644 --- a/src/main/java/com/lacunasoftware/signer/documentmark/PrePositionedDocumentMarkModel.java +++ b/src/main/java/com/lacunasoftware/signer/documentmark/PrePositionedDocumentMarkModel.java @@ -13,10 +13,8 @@ package com.lacunasoftware.signer.documentmark; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.DocumentMarkType; import io.swagger.v3.oas.annotations.media.Schema; /** @@ -25,25 +23,33 @@ @Schema(description = "Model used to set the position of a document mark before it's associated flow action is completed.") public class PrePositionedDocumentMarkModel { - @JsonProperty("type") + @JsonProperty("type") + @SerializedName("type") + private DocumentMarkType type = null; + @JsonProperty("uploadId") + @SerializedName("uploadId") - @JsonProperty("uploadId") private String uploadId = null; + @JsonProperty("topLeftX") + @SerializedName("topLeftX") - @JsonProperty("topLeftX") private Double topLeftX = null; + @JsonProperty("topLeftY") + @SerializedName("topLeftY") - @JsonProperty("topLeftY") private Double topLeftY = null; + @JsonProperty("width") + @SerializedName("width") - @JsonProperty("width") private Double width = null; + @JsonProperty("height") + @SerializedName("height") - @JsonProperty("height") private Double height = null; + @JsonProperty("pageNumber") + @SerializedName("pageNumber") - @JsonProperty("pageNumber") private Integer pageNumber = null; public PrePositionedDocumentMarkModel type(DocumentMarkType type) { diff --git a/src/main/java/com/lacunasoftware/signer/documentmark/UploadTicketModel.java b/src/main/java/com/lacunasoftware/signer/documentmark/UploadTicketModel.java index cd76759..7492b30 100644 --- a/src/main/java/com/lacunasoftware/signer/documentmark/UploadTicketModel.java +++ b/src/main/java/com/lacunasoftware/signer/documentmark/UploadTicketModel.java @@ -13,10 +13,9 @@ package com.lacunasoftware.signer.documentmark; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * UploadTicketModel @@ -24,10 +23,13 @@ public class UploadTicketModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private String id = null; + @JsonProperty("location") + @SerializedName("location") - @JsonProperty("location") private String location = null; public UploadTicketModel id(String id) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/ActionUrlRequest.java b/src/main/java/com/lacunasoftware/signer/documents/ActionUrlRequest.java index 0866803..56983d1 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/ActionUrlRequest.java +++ b/src/main/java/com/lacunasoftware/signer/documents/ActionUrlRequest.java @@ -13,10 +13,9 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * ActionUrlRequest @@ -24,13 +23,17 @@ public class ActionUrlRequest { - @JsonProperty("identifier") + @JsonProperty("identifier") + @SerializedName("identifier") + private String identifier = null; + @JsonProperty("emailAddress") + @SerializedName("emailAddress") - @JsonProperty("emailAddress") private String emailAddress = null; + @JsonProperty("requireEmailAuthentication") + @SerializedName("requireEmailAuthentication") - @JsonProperty("requireEmailAuthentication") private Boolean requireEmailAuthentication = null; public ActionUrlRequest identifier(String identifier) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/ActionUrlResponse.java b/src/main/java/com/lacunasoftware/signer/documents/ActionUrlResponse.java index ad93293..1d8094b 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/ActionUrlResponse.java +++ b/src/main/java/com/lacunasoftware/signer/documents/ActionUrlResponse.java @@ -13,10 +13,9 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * ActionUrlResponse @@ -24,10 +23,13 @@ public class ActionUrlResponse { - @JsonProperty("url") + @JsonProperty("url") + @SerializedName("url") + private String url = null; + @JsonProperty("embedUrl") + @SerializedName("embedUrl") - @JsonProperty("embedUrl") private String embedUrl = null; public ActionUrlResponse url(String url) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/CancelDocumentRequest.java b/src/main/java/com/lacunasoftware/signer/documents/CancelDocumentRequest.java index 2dc800d..f5633bf 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/CancelDocumentRequest.java +++ b/src/main/java/com/lacunasoftware/signer/documents/CancelDocumentRequest.java @@ -13,10 +13,9 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * CancelDocumentRequest @@ -24,7 +23,9 @@ public class CancelDocumentRequest { - @JsonProperty("reason") + @JsonProperty("reason") + @SerializedName("reason") + private String reason = null; public CancelDocumentRequest reason(String reason) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/CreateDocumentRequest.java b/src/main/java/com/lacunasoftware/signer/documents/CreateDocumentRequest.java index 9d79390..edb70f8 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/CreateDocumentRequest.java +++ b/src/main/java/com/lacunasoftware/signer/documents/CreateDocumentRequest.java @@ -13,13 +13,9 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.attachments.AttachmentUploadModel; -import com.lacunasoftware.signer.documents.DocumentAdditionalInfoData; -import com.lacunasoftware.signer.documents.DocumentTagData; import com.lacunasoftware.signer.FileUploadModel; import com.lacunasoftware.signer.flowactions.FlowActionCreateModel; import com.lacunasoftware.signer.observers.ObserverCreateModel; @@ -36,55 +32,73 @@ public class CreateDocumentRequest { - @JsonProperty("files") + @JsonProperty("files") + @SerializedName("files") + private List files = new ArrayList(); + @JsonProperty("attachments") + @SerializedName("attachments") - @JsonProperty("attachments") private List attachments = null; + @JsonProperty("xmlNamespaces") + @SerializedName("xmlNamespaces") - @JsonProperty("xmlNamespaces") private List xmlNamespaces = null; + @JsonProperty("isEnvelope") + @SerializedName("isEnvelope") - @JsonProperty("isEnvelope") private Boolean isEnvelope = null; + @JsonProperty("envelopeName") + @SerializedName("envelopeName") - @JsonProperty("envelopeName") private String envelopeName = null; + @JsonProperty("participantsDataFile") + @SerializedName("participantsDataFile") - @JsonProperty("participantsDataFile") private UploadModel participantsDataFile = null; + @JsonProperty("folderId") + @SerializedName("folderId") - @JsonProperty("folderId") private UUID folderId = null; + @JsonProperty("description") + @SerializedName("description") - @JsonProperty("description") private String description = null; + @JsonProperty("flowActions") + @SerializedName("flowActions") - @JsonProperty("flowActions") private List flowActions = new ArrayList(); + @JsonProperty("observers") + @SerializedName("observers") - @JsonProperty("observers") private List observers = null; + @JsonProperty("disablePendingActionNotifications") + @SerializedName("disablePendingActionNotifications") - @JsonProperty("disablePendingActionNotifications") private Boolean disablePendingActionNotifications = null; + @JsonProperty("newFolderName") + @SerializedName("newFolderName") - @JsonProperty("newFolderName") private String newFolderName = null; + @JsonProperty("forceCadesSignature") + @SerializedName("forceCadesSignature") - @JsonProperty("forceCadesSignature") private Boolean forceCadesSignature = null; + @JsonProperty("notifiedEmails") + @SerializedName("notifiedEmails") - @JsonProperty("notifiedEmails") private List notifiedEmails = null; + @JsonProperty("additionalInfo") + @SerializedName("additionalInfo") - @JsonProperty("additionalInfo") private DocumentAdditionalInfoData additionalInfo = null; + @JsonProperty("tags") + @SerializedName("tags") - @JsonProperty("tags") private List tags = null; + @JsonProperty("expirationDate") + @SerializedName("expirationDate") - @JsonProperty("expirationDate") private OffsetDateTime expirationDate = null; public CreateDocumentRequest files(List files) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/CreateDocumentResult.java b/src/main/java/com/lacunasoftware/signer/documents/CreateDocumentResult.java index 436cf79..e5f1c86 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/CreateDocumentResult.java +++ b/src/main/java/com/lacunasoftware/signer/documents/CreateDocumentResult.java @@ -13,10 +13,8 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.attachments.CreateAttachmentResult; import io.swagger.v3.oas.annotations.media.Schema; import java.util.ArrayList; @@ -28,13 +26,17 @@ public class CreateDocumentResult { - @JsonProperty("uploadId") + @JsonProperty("uploadId") + @SerializedName("uploadId") + private String uploadId = null; + @JsonProperty("documentId") + @SerializedName("documentId") - @JsonProperty("documentId") private UUID documentId = null; + @JsonProperty("attachments") + @SerializedName("attachments") - @JsonProperty("attachments") private List attachments = null; public CreateDocumentResult uploadId(String uploadId) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/CreatorModel.java b/src/main/java/com/lacunasoftware/signer/documents/CreatorModel.java index f36392b..434982b 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/CreatorModel.java +++ b/src/main/java/com/lacunasoftware/signer/documents/CreatorModel.java @@ -13,22 +13,25 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * CreatorModel */ public class CreatorModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private UUID id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; public CreatorModel id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/DocumentAddVersionRequest.java b/src/main/java/com/lacunasoftware/signer/documents/DocumentAddVersionRequest.java index 25eb81f..9973447 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/DocumentAddVersionRequest.java +++ b/src/main/java/com/lacunasoftware/signer/documents/DocumentAddVersionRequest.java @@ -13,12 +13,11 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.documents.DocumentAdditionalInfoData; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.FileUploadModel; + import io.swagger.v3.oas.annotations.media.Schema; /** * DocumentAddVersionRequest @@ -26,13 +25,17 @@ public class DocumentAddVersionRequest { - @JsonProperty("file") + @JsonProperty("file") + @SerializedName("file") + private FileUploadModel file = null; + @JsonProperty("disablePendingActionNotifications") + @SerializedName("disablePendingActionNotifications") - @JsonProperty("disablePendingActionNotifications") private Boolean disablePendingActionNotifications = null; + @JsonProperty("additionalInfo") + @SerializedName("additionalInfo") - @JsonProperty("additionalInfo") private DocumentAdditionalInfoData additionalInfo = null; public DocumentAddVersionRequest file(FileUploadModel file) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/DocumentAdditionalInfoData.java b/src/main/java/com/lacunasoftware/signer/documents/DocumentAdditionalInfoData.java index 912ea0c..4102e69 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/DocumentAdditionalInfoData.java +++ b/src/main/java/com/lacunasoftware/signer/documents/DocumentAdditionalInfoData.java @@ -13,14 +13,11 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.healthdocuments.HealthDocumentData; import io.swagger.v3.oas.annotations.media.Schema; import java.util.HashMap; -import java.util.List; import java.util.Map; /** * DocumentAdditionalInfoData @@ -28,13 +25,17 @@ public class DocumentAdditionalInfoData { - @JsonProperty("healthData") + @JsonProperty("healthData") + @SerializedName("healthData") + private HealthDocumentData healthData = null; + @JsonProperty("fields") + @SerializedName("fields") - @JsonProperty("fields") private Map fields = null; + @JsonProperty("metadata") + @SerializedName("metadata") - @JsonProperty("metadata") private Map metadata = null; public DocumentAdditionalInfoData healthData(HealthDocumentData healthData) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/DocumentContentModel.java b/src/main/java/com/lacunasoftware/signer/documents/DocumentContentModel.java index 3beea3a..4be68b6 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/DocumentContentModel.java +++ b/src/main/java/com/lacunasoftware/signer/documents/DocumentContentModel.java @@ -12,11 +12,12 @@ package com.lacunasoftware.signer.documents; -import java.util.Objects; import java.util.Arrays; +import java.util.Objects; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * DocumentContentModel @@ -24,13 +25,17 @@ public class DocumentContentModel { - @JsonProperty("bytes") + @JsonProperty("bytes") + @SerializedName("bytes") + private byte[] bytes = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("contentType") + @SerializedName("contentType") - @JsonProperty("contentType") private String contentType = null; public DocumentContentModel bytes(byte[] bytes) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/DocumentFileModel.java b/src/main/java/com/lacunasoftware/signer/documents/DocumentFileModel.java index 4565628..9814795 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/DocumentFileModel.java +++ b/src/main/java/com/lacunasoftware/signer/documents/DocumentFileModel.java @@ -13,44 +13,55 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.v3.oas.annotations.media.Schema; import java.util.UUID; + import org.threeten.bp.OffsetDateTime; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; + +import io.swagger.v3.oas.annotations.media.Schema; /** * DocumentFileModel */ public class DocumentFileModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private UUID id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("isSigned") + @SerializedName("isSigned") - @JsonProperty("isSigned") private Boolean isSigned = null; + @JsonProperty("isEnvelopePart") + @SerializedName("isEnvelopePart") - @JsonProperty("isEnvelopePart") private Boolean isEnvelopePart = null; + @JsonProperty("envelopeStartPage") + @SerializedName("envelopeStartPage") - @JsonProperty("envelopeStartPage") private Integer envelopeStartPage = null; + @JsonProperty("numberPages") + @SerializedName("numberPages") - @JsonProperty("numberPages") private Integer numberPages = null; + @JsonProperty("mimeType") + @SerializedName("mimeType") - @JsonProperty("mimeType") private String mimeType = null; + @JsonProperty("filename") + @SerializedName("filename") - @JsonProperty("filename") private String filename = null; + @JsonProperty("creationDate") + @SerializedName("creationDate") - @JsonProperty("creationDate") private OffsetDateTime creationDate = null; public DocumentFileModel id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/DocumentFlowEditRequest.java b/src/main/java/com/lacunasoftware/signer/documents/DocumentFlowEditRequest.java index c6acb75..b47267b 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/DocumentFlowEditRequest.java +++ b/src/main/java/com/lacunasoftware/signer/documents/DocumentFlowEditRequest.java @@ -12,41 +12,48 @@ package com.lacunasoftware.signer.documents; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.flowactions.FlowActionCreateModel; import com.lacunasoftware.signer.flowactions.FlowActionEditModel; import com.lacunasoftware.signer.observers.ObserverCreateModel; import com.lacunasoftware.signer.observers.ObserverEditModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; /** * DocumentFlowEditRequest */ public class DocumentFlowEditRequest { - @JsonProperty("addedFlowActions") + @JsonProperty("addedFlowActions") + @SerializedName("addedFlowActions") + private List addedFlowActions = null; + @JsonProperty("editedFlowActions") + @SerializedName("editedFlowActions") - @JsonProperty("editedFlowActions") private List editedFlowActions = null; + @JsonProperty("deletedFlowActionIds") + @SerializedName("deletedFlowActionIds") - @JsonProperty("deletedFlowActionIds") private List deletedFlowActionIds = null; + @JsonProperty("addedObservers") + @SerializedName("addedObservers") - @JsonProperty("addedObservers") private List addedObservers = null; + @JsonProperty("editedObservers") + @SerializedName("editedObservers") - @JsonProperty("editedObservers") private List editedObservers = null; + @JsonProperty("deletedObserverIds") + @SerializedName("deletedObserverIds") - @JsonProperty("deletedObserverIds") private List deletedObserverIds = null; public DocumentFlowEditRequest addedFlowActions(List addedFlowActions) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/DocumentListModel.java b/src/main/java/com/lacunasoftware/signer/documents/DocumentListModel.java index a99373e..5758f6e 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/DocumentListModel.java +++ b/src/main/java/com/lacunasoftware/signer/documents/DocumentListModel.java @@ -13,12 +13,9 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.DocumentTypes; -import com.lacunasoftware.signer.documents.DocumentTagModel; import com.lacunasoftware.signer.folders.FolderInfoModel; import io.swagger.v3.oas.annotations.media.Schema; import java.util.ArrayList; @@ -31,25 +28,33 @@ public class DocumentListModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private UUID id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("creationDate") + @SerializedName("creationDate") - @JsonProperty("creationDate") private OffsetDateTime creationDate = null; + @JsonProperty("updateDate") + @SerializedName("updateDate") - @JsonProperty("updateDate") private OffsetDateTime updateDate = null; + @JsonProperty("folder") + @SerializedName("folder") - @JsonProperty("folder") private FolderInfoModel folder = null; + @JsonProperty("type") + @SerializedName("type") - @JsonProperty("type") private DocumentTypes type = null; + @JsonProperty("tags") + @SerializedName("tags") - @JsonProperty("tags") private List tags = null; public DocumentListModel id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/DocumentModel.java b/src/main/java/com/lacunasoftware/signer/documents/DocumentModel.java index b71a5c2..c3ef32f 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/DocumentModel.java +++ b/src/main/java/com/lacunasoftware/signer/documents/DocumentModel.java @@ -13,16 +13,11 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; import com.lacunasoftware.signer.agents.AgentModel; import com.lacunasoftware.signer.attachments.AttachmentModel; import com.lacunasoftware.signer.DocumentStatus; -import com.lacunasoftware.signer.documents.CreatorModel; -import com.lacunasoftware.signer.documents.DocumentPermissionsModel; -import com.lacunasoftware.signer.documents.DocumentTagModel; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.flowactions.FlowActionModel; import com.lacunasoftware.signer.folders.FolderInfoModel; import com.lacunasoftware.signer.observers.ObserverModel; @@ -39,90 +34,119 @@ public class DocumentModel { @JsonProperty("checksumMd5") + @SerializedName("checksumMd5") private String checksumMd5 = null; @JsonProperty("isDeleted") + @SerializedName("isDeleted") private Boolean isDeleted = null; @JsonProperty("flowActions") + @SerializedName("flowActions") private List flowActions = null; @JsonProperty("observers") + @SerializedName("observers") private List observers = null; @JsonProperty("attachments") + @SerializedName("attachments") private List attachments = null; @JsonProperty("permissions") + @SerializedName("permissions") private DocumentPermissionsModel permissions = null; @JsonProperty("notifiedEmails") + @SerializedName("notifiedEmails") private List notifiedEmails = null; @JsonProperty("id") + @SerializedName("id") private UUID id = null; @JsonProperty("name") + @SerializedName("name") private String name = null; @JsonProperty("filename") + @SerializedName("filename") private String filename = null; @JsonProperty("fileSize") + @SerializedName("fileSize") private Long fileSize = null; @JsonProperty("mimeType") + @SerializedName("mimeType") private String mimeType = null; @JsonProperty("hasSignature") + @SerializedName("hasSignature") private Boolean hasSignature = null; @JsonProperty("status") + @SerializedName("status") private DocumentStatus status = null; @JsonProperty("isConcluded") + @SerializedName("isConcluded") private Boolean isConcluded = null; @JsonProperty("folder") + @SerializedName("folder") private FolderInfoModel folder = null; @JsonProperty("organization") + @SerializedName("organization") private OrganizationInfoModel organization = null; @JsonProperty("creationDate") + @SerializedName("creationDate") private OffsetDateTime creationDate = null; @JsonProperty("updateDate") + @SerializedName("updateDate") private OffsetDateTime updateDate = null; @JsonProperty("expirationDate") + @SerializedName("expirationDate") private OffsetDateTime expirationDate = null; @JsonProperty("expirationDateWithoutTime") + @SerializedName("expirationDateWithoutTime") private String expirationDateWithoutTime = null; @JsonProperty("createdBy") + @SerializedName("createdBy") private CreatorModel createdBy = null; @JsonProperty("description") + @SerializedName("description") private String description = null; @JsonProperty("forceCadesSignature") + @SerializedName("forceCadesSignature") private Boolean forceCadesSignature = null; @JsonProperty("isScanned") + @SerializedName("isScanned") private Boolean isScanned = null; @JsonProperty("isEnvelope") + @SerializedName("isEnvelope") private Boolean isEnvelope = null; @JsonProperty("statusUpdatedBy") + @SerializedName("statusUpdatedBy") private AgentModel statusUpdatedBy = null; @JsonProperty("statusUpdateReason") + @SerializedName("statusUpdateReason") private String statusUpdateReason = null; @JsonProperty("tags") + @SerializedName("tags") private List tags = null; public DocumentModel checksumMd5(String checksumMd5) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/DocumentNotifiedEmailsEditRequest.java b/src/main/java/com/lacunasoftware/signer/documents/DocumentNotifiedEmailsEditRequest.java index b6a19f6..1cd1da2 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/DocumentNotifiedEmailsEditRequest.java +++ b/src/main/java/com/lacunasoftware/signer/documents/DocumentNotifiedEmailsEditRequest.java @@ -12,21 +12,23 @@ package com.lacunasoftware.signer.documents; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * DocumentNotifiedEmailsEditRequest */ public class DocumentNotifiedEmailsEditRequest { - @JsonProperty("emails") + @JsonProperty("emails") + @SerializedName("emails") + private List emails = null; public DocumentNotifiedEmailsEditRequest emails(List emails) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/DocumentPermissionsModel.java b/src/main/java/com/lacunasoftware/signer/documents/DocumentPermissionsModel.java index 383154f..b937109 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/DocumentPermissionsModel.java +++ b/src/main/java/com/lacunasoftware/signer/documents/DocumentPermissionsModel.java @@ -13,10 +13,9 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * DocumentPermissionsModel @@ -24,10 +23,13 @@ public class DocumentPermissionsModel { - @JsonProperty("move") + @JsonProperty("move") + @SerializedName("move") + private Boolean move = null; + @JsonProperty("editFlow") + @SerializedName("editFlow") - @JsonProperty("editFlow") private Boolean editFlow = null; public DocumentPermissionsModel move(Boolean move) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/DocumentSignaturesInfoModel.java b/src/main/java/com/lacunasoftware/signer/documents/DocumentSignaturesInfoModel.java index 0bb2f83..aab9498 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/DocumentSignaturesInfoModel.java +++ b/src/main/java/com/lacunasoftware/signer/documents/DocumentSignaturesInfoModel.java @@ -13,13 +13,10 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.DocumentStatus; import com.lacunasoftware.signer.DocumentTypes; -import com.lacunasoftware.signer.documents.CreatorModel; import com.lacunasoftware.signer.SignerModel; import io.swagger.v3.oas.annotations.media.Schema; import java.util.ArrayList; @@ -32,43 +29,57 @@ public class DocumentSignaturesInfoModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private UUID id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("filename") + @SerializedName("filename") - @JsonProperty("filename") private String filename = null; + @JsonProperty("mimeType") + @SerializedName("mimeType") - @JsonProperty("mimeType") private String mimeType = null; + @JsonProperty("createdBy") + @SerializedName("createdBy") - @JsonProperty("createdBy") private CreatorModel createdBy = null; + @JsonProperty("isConcluded") + @SerializedName("isConcluded") - @JsonProperty("isConcluded") private Boolean isConcluded = null; + @JsonProperty("isFile") + @SerializedName("isFile") - @JsonProperty("isFile") private Boolean isFile = null; + @JsonProperty("isEnvelope") + @SerializedName("isEnvelope") - @JsonProperty("isEnvelope") private Boolean isEnvelope = null; + @JsonProperty("creationDate") + @SerializedName("creationDate") - @JsonProperty("creationDate") private OffsetDateTime creationDate = null; + @JsonProperty("updateDate") + @SerializedName("updateDate") - @JsonProperty("updateDate") private OffsetDateTime updateDate = null; + @JsonProperty("signers") + @SerializedName("signers") - @JsonProperty("signers") private List signers = null; + @JsonProperty("status") + @SerializedName("status") - @JsonProperty("status") private DocumentStatus status = null; + @JsonProperty("type") + @SerializedName("type") - @JsonProperty("type") private DocumentTypes type = null; public DocumentSignaturesInfoModel id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/DocumentTagData.java b/src/main/java/com/lacunasoftware/signer/documents/DocumentTagData.java index abccd45..8142220 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/DocumentTagData.java +++ b/src/main/java/com/lacunasoftware/signer/documents/DocumentTagData.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * DocumentTagData @@ -24,10 +24,13 @@ public class DocumentTagData { - @JsonProperty("label") + @JsonProperty("label") + @SerializedName("label") + private String label = null; + @JsonProperty("value") + @SerializedName("value") - @JsonProperty("value") private String value = null; public DocumentTagData label(String label) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/DocumentTagModel.java b/src/main/java/com/lacunasoftware/signer/documents/DocumentTagModel.java index c832698..9651de6 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/DocumentTagModel.java +++ b/src/main/java/com/lacunasoftware/signer/documents/DocumentTagModel.java @@ -13,25 +13,28 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * DocumentTagModel */ public class DocumentTagModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - @JsonProperty("label") + @JsonProperty("label") + @SerializedName("label") private String label = null; - - @JsonProperty("value") + + @JsonProperty("value") + @SerializedName("value") private String value = null; public DocumentTagModel id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/EnvelopeAddVersionRequest.java b/src/main/java/com/lacunasoftware/signer/documents/EnvelopeAddVersionRequest.java index 4ea31d3..e1f4783 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/EnvelopeAddVersionRequest.java +++ b/src/main/java/com/lacunasoftware/signer/documents/EnvelopeAddVersionRequest.java @@ -12,32 +12,36 @@ package com.lacunasoftware.signer.documents; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.documents.DocumentAdditionalInfoData; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.FileUploadModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * EnvelopeAddVersionRequest */ public class EnvelopeAddVersionRequest { - @JsonProperty("files") + @JsonProperty("files") + @SerializedName("files") + private List files = null; + @JsonProperty("envelopeName") + @SerializedName("envelopeName") - @JsonProperty("envelopeName") private String envelopeName = null; + @JsonProperty("disablePendingActionNotifications") + @SerializedName("disablePendingActionNotifications") - @JsonProperty("disablePendingActionNotifications") private Boolean disablePendingActionNotifications = null; + @JsonProperty("additionalInfo") + @SerializedName("additionalInfo") - @JsonProperty("additionalInfo") private DocumentAdditionalInfoData additionalInfo = null; public EnvelopeAddVersionRequest files(List files) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/FlowActionPendingModel.java b/src/main/java/com/lacunasoftware/signer/documents/FlowActionPendingModel.java index 949e161..521d6ba 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/FlowActionPendingModel.java +++ b/src/main/java/com/lacunasoftware/signer/documents/FlowActionPendingModel.java @@ -13,10 +13,9 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; import java.util.UUID; /** @@ -25,13 +24,16 @@ public class FlowActionPendingModel { - @JsonProperty("signerId") + @JsonProperty("signerId") + @SerializedName("signerId") private UUID signerId = null; - @JsonProperty("approverId") + @JsonProperty("approverId") + @SerializedName("approverId") private UUID approverId = null; - @JsonProperty("signRuleId") + @JsonProperty("signRuleId") + @SerializedName("signRuleId") private UUID signRuleId = null; public FlowActionPendingModel signerId(UUID signerId) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/GenerateDocumentRequest.java b/src/main/java/com/lacunasoftware/signer/documents/GenerateDocumentRequest.java index 56b6d90..45375b6 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/GenerateDocumentRequest.java +++ b/src/main/java/com/lacunasoftware/signer/documents/GenerateDocumentRequest.java @@ -5,43 +5,56 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.NotaryTypes; import com.lacunasoftware.signer.flowactions.FlowActionCreateModel; import com.lacunasoftware.signer.javaclient.models.UploadModel; import com.lacunasoftware.signer.observers.ObserverCreateModel; public class GenerateDocumentRequest { - @JsonProperty("flowActions") + @JsonProperty("flowActions") + @SerializedName("flowActions") + private List flowActions; + @JsonProperty("observers") + @SerializedName("observers") - @JsonProperty("observers") private List observers; + @JsonProperty("folderId") + @SerializedName("folderId") - @JsonProperty("folderId") private String folderId; + @JsonProperty("newFolderName") + @SerializedName("newFolderName") - @JsonProperty("newFolderName") private String newFolderName; + @JsonProperty("organizationId") + @SerializedName("organizationId") - @JsonProperty("organizationId") private String organizationId; + @JsonProperty("type") + @SerializedName("type") - @JsonProperty("type") private String type; + @JsonProperty("notaryType") + @SerializedName("notaryType") - @JsonProperty("notaryType") private NotaryTypes notaryType; + @JsonProperty("expirationDate") + @SerializedName("expirationDate") - @JsonProperty("expirationDate") private LocalDateTime expirationDate; + @JsonProperty("notifiedEmails") + @SerializedName("notifiedEmails") - @JsonProperty("notifiedEmails") private List notifiedEmails; + @JsonProperty("dataFile") + @SerializedName("dataFile") - @JsonProperty("dataFile") private UploadModel dataFile; + @JsonProperty("templateFile") + @SerializedName("templateFile") - @JsonProperty("templateFile") private UploadModel templateFile; public GenerateDocumentRequest() { diff --git a/src/main/java/com/lacunasoftware/signer/documents/GenerationDocumentResult.java b/src/main/java/com/lacunasoftware/signer/documents/GenerationDocumentResult.java index db3c95c..7bd3d30 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/GenerationDocumentResult.java +++ b/src/main/java/com/lacunasoftware/signer/documents/GenerationDocumentResult.java @@ -3,34 +3,44 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; public class GenerationDocumentResult { - - @JsonProperty("folderId") + @JsonProperty("folderId") + @SerializedName("folderId") + private String folderId; + @JsonProperty("subscriptionId") + @SerializedName("subscriptionId") - @JsonProperty("subscriptionId") private String subscriptionId; + @JsonProperty("id") + @SerializedName("id") - @JsonProperty("id") private String id; + @JsonProperty("type") + @SerializedName("type") - @JsonProperty("type") private String type; + @JsonProperty("agentId") + @SerializedName("agentId") - @JsonProperty("agentId") private String agentId; + @JsonProperty("totalDocumentsCount") + @SerializedName("totalDocumentsCount") - @JsonProperty("totalDocumentsCount") private Integer totalDocumentsCount; + @JsonProperty("initializedCount") + @SerializedName("initializedCount") - @JsonProperty("initializedCount") private Integer initializedCount; + @JsonProperty("completedCount") + @SerializedName("completedCount") - @JsonProperty("completedCount") private Integer completedCount; + @JsonProperty("status") + @SerializedName("status") - @JsonProperty("status") private String status; // Default constructor public GenerationDocumentResult() {} diff --git a/src/main/java/com/lacunasoftware/signer/documents/MoveDocumentBatchRequest.java b/src/main/java/com/lacunasoftware/signer/documents/MoveDocumentBatchRequest.java index 2f296ed..52237e9 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/MoveDocumentBatchRequest.java +++ b/src/main/java/com/lacunasoftware/signer/documents/MoveDocumentBatchRequest.java @@ -12,28 +12,32 @@ package com.lacunasoftware.signer.documents; -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.v3.oas.annotations.media.Schema; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.UUID; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; + +import io.swagger.v3.oas.annotations.media.Schema; /** * MoveDocumentBatchRequest */ public class MoveDocumentBatchRequest { - @JsonProperty("documents") + @JsonProperty("documents") + @SerializedName("documents") + private List documents = null; + @JsonProperty("folderId") + @SerializedName("folderId") - @JsonProperty("folderId") private UUID folderId = null; + @JsonProperty("newFolderName") + @SerializedName("newFolderName") - @JsonProperty("newFolderName") private String newFolderName = null; public MoveDocumentBatchRequest documents(List documents) { diff --git a/src/main/java/com/lacunasoftware/signer/documents/MoveDocumentRequest.java b/src/main/java/com/lacunasoftware/signer/documents/MoveDocumentRequest.java index b0d7308..039f4d1 100644 --- a/src/main/java/com/lacunasoftware/signer/documents/MoveDocumentRequest.java +++ b/src/main/java/com/lacunasoftware/signer/documents/MoveDocumentRequest.java @@ -13,22 +13,24 @@ package com.lacunasoftware.signer.documents; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * MoveDocumentRequest */ public class MoveDocumentRequest { - @JsonProperty("folderId") + @JsonProperty("folderId") + @SerializedName("folderId") private UUID folderId = null; - @JsonProperty("newFolderName") + @JsonProperty("newFolderName") + @SerializedName("newFolderName") private String newFolderName = null; public MoveDocumentRequest folderId(UUID folderId) { diff --git a/src/main/java/com/lacunasoftware/signer/flowactions/ApprovalModel.java b/src/main/java/com/lacunasoftware/signer/flowactions/ApprovalModel.java index 3539862..bbf1d7b 100644 --- a/src/main/java/com/lacunasoftware/signer/flowactions/ApprovalModel.java +++ b/src/main/java/com/lacunasoftware/signer/flowactions/ApprovalModel.java @@ -13,35 +13,43 @@ package com.lacunasoftware.signer.flowactions; import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.v3.oas.annotations.media.Schema; import java.util.UUID; + import org.threeten.bp.OffsetDateTime; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; + +import io.swagger.v3.oas.annotations.media.Schema; /** * ApprovalModel */ public class ApprovalModel { - @JsonProperty("flowActionId") + @JsonProperty("flowActionId") + @SerializedName("flowActionId") + private UUID flowActionId = null; + @JsonProperty("date") + @SerializedName("date") - @JsonProperty("date") private OffsetDateTime date = null; + @JsonProperty("userId") + @SerializedName("userId") - @JsonProperty("userId") private UUID userId = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("identifier") + @SerializedName("identifier") - @JsonProperty("identifier") private String identifier = null; + @JsonProperty("emailAddress") + @SerializedName("emailAddress") - @JsonProperty("emailAddress") private String emailAddress = null; public ApprovalModel flowActionId(UUID flowActionId) { diff --git a/src/main/java/com/lacunasoftware/signer/flowactions/DocumentFlowEditResponse.java b/src/main/java/com/lacunasoftware/signer/flowactions/DocumentFlowEditResponse.java index 9d0c833..e2203a6 100644 --- a/src/main/java/com/lacunasoftware/signer/flowactions/DocumentFlowEditResponse.java +++ b/src/main/java/com/lacunasoftware/signer/flowactions/DocumentFlowEditResponse.java @@ -13,11 +13,8 @@ package com.lacunasoftware.signer.flowactions; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.flowactions.RectifiedParticipantModel; +import com.google.gson.annotations.SerializedName; import io.swagger.v3.oas.annotations.media.Schema; import java.util.ArrayList; import java.util.List; @@ -27,7 +24,8 @@ public class DocumentFlowEditResponse { - @JsonProperty("rectifiedParticipants") + @JsonProperty("rectifiedParticipants") + @SerializedName("rectifiedParticipants") private List rectifiedParticipants = null; public DocumentFlowEditResponse rectifiedParticipants(List rectifiedParticipants) { diff --git a/src/main/java/com/lacunasoftware/signer/flowactions/FlowActionCreateModel.java b/src/main/java/com/lacunasoftware/signer/flowactions/FlowActionCreateModel.java index 94ee99d..05bc3e8 100644 --- a/src/main/java/com/lacunasoftware/signer/flowactions/FlowActionCreateModel.java +++ b/src/main/java/com/lacunasoftware/signer/flowactions/FlowActionCreateModel.java @@ -13,15 +13,12 @@ package com.lacunasoftware.signer.flowactions; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.CertificateHolderTypes; import com.lacunasoftware.signer.CertificateTypes; import com.lacunasoftware.signer.documentmark.PrePositionedDocumentMarkModel; import com.lacunasoftware.signer.FlowActionType; -import com.lacunasoftware.signer.flowactions.XadesOptionsModel; import com.lacunasoftware.signer.SignatureInitialsModes; import com.lacunasoftware.signer.users.ParticipantUserModel; import io.swagger.v3.oas.annotations.media.Schema; @@ -34,66 +31,87 @@ public class FlowActionCreateModel { @JsonProperty("type") + @SerializedName("type") private FlowActionType type = null; @JsonProperty("step") + @SerializedName("step") private Integer step = null; @JsonProperty("user") + @SerializedName("user") private ParticipantUserModel user = null; @JsonProperty("numberRequiredSignatures") + @SerializedName("numberRequiredSignatures") private Integer numberRequiredSignatures = null; @JsonProperty("ruleName") + @SerializedName("ruleName") private String ruleName = null; @JsonProperty("allowRuleFlowToContinueIfRefused") + @SerializedName("allowRuleFlowToContinueIfRefused") private Boolean allowRuleFlowToContinueIfRefused = null; @JsonProperty("title") + @SerializedName("title") private String title = null; @JsonProperty("signRuleUsers") + @SerializedName("signRuleUsers") private List signRuleUsers = null; @JsonProperty("prePositionedMarks") + @SerializedName("prePositionedMarks") private List prePositionedMarks = null; @JsonProperty("allowElectronicSignature") + @SerializedName("allowElectronicSignature") private Boolean allowElectronicSignature = null; @JsonProperty("requireSmsAuthenticationToSignElectronically") + @SerializedName("requireSmsAuthenticationToSignElectronically") private Boolean requireSmsAuthenticationToSignElectronically = null; @JsonProperty("requireAuthenticatorAppToSignElectronically") + @SerializedName("requireAuthenticatorAppToSignElectronically") private Boolean requireAuthenticatorAppToSignElectronically = null; @JsonProperty("requireSelfieAuthenticationToSignElectronically") + @SerializedName("requireSelfieAuthenticationToSignElectronically") private Boolean requireSelfieAuthenticationToSignElectronically = null; @JsonProperty("requireDatavalidAuthenticationToSignElectronically") + @SerializedName("requireDatavalidAuthenticationToSignElectronically") private Boolean requireDatavalidAuthenticationToSignElectronically = null; @JsonProperty("requirePixAuthenticationToSignElectronically") + @SerializedName("requirePixAuthenticationToSignElectronically") private Boolean requirePixAuthenticationToSignElectronically = null; @JsonProperty("requiredCertificateTypeToSign") + @SerializedName("requiredCertificateTypeToSign") private CertificateTypes requiredCertificateTypeToSign = null; @JsonProperty("requireCompanyCertificate") + @SerializedName("requireCompanyCertificate") private Boolean requireCompanyCertificate = null; @JsonProperty("requiredCompanyIdentifier") + @SerializedName("requiredCompanyIdentifier") private String requiredCompanyIdentifier = null; @JsonProperty("requiredCertificateHolderTypeToSign") + @SerializedName("requiredCertificateHolderTypeToSign") private CertificateHolderTypes requiredCertificateHolderTypeToSign = null; @JsonProperty("xadesOptions") + @SerializedName("xadesOptions") private XadesOptionsModel xadesOptions = null; @JsonProperty("signatureInitialsMode") + @SerializedName("signatureInitialsMode") private SignatureInitialsModes signatureInitialsMode = null; public FlowActionCreateModel type(FlowActionType type) { diff --git a/src/main/java/com/lacunasoftware/signer/flowactions/FlowActionEditModel.java b/src/main/java/com/lacunasoftware/signer/flowactions/FlowActionEditModel.java index cbd5728..532ee22 100644 --- a/src/main/java/com/lacunasoftware/signer/flowactions/FlowActionEditModel.java +++ b/src/main/java/com/lacunasoftware/signer/flowactions/FlowActionEditModel.java @@ -12,46 +12,53 @@ package com.lacunasoftware.signer.flowactions; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.documentmark.PrePositionedDocumentMarkModel; -import com.lacunasoftware.signer.flowactions.SignRuleUserEditModel; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.SignatureInitialsModes; +import com.lacunasoftware.signer.documentmark.PrePositionedDocumentMarkModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; /** * FlowActionEditModel */ public class FlowActionEditModel { - @JsonProperty("flowActionId") + @JsonProperty("flowActionId") + @SerializedName("flowActionId") private UUID flowActionId = null; - @JsonProperty("step") + @JsonProperty("step") + @SerializedName("step") private Integer step = null; - - @JsonProperty("participantEmailAddress") + + @JsonProperty("participantEmailAddress") + @SerializedName("participantEmailAddress") private String participantEmailAddress = null; - @JsonProperty("ruleName") + @JsonProperty("ruleName") + @SerializedName("ruleName") private String ruleName = null; - @JsonProperty("signRuleUsers") + @JsonProperty("signRuleUsers") + @SerializedName("signRuleUsers") private List signRuleUsers = null; - @JsonProperty("title") + @JsonProperty("title") + @SerializedName("title") private String title = null; - - @JsonProperty("prePositionedMarks") + + @JsonProperty("prePositionedMarks") + @SerializedName("prePositionedMarks") private List prePositionedMarks = null; - @JsonProperty("signatureInitialsMode") + @JsonProperty("signatureInitialsMode") + @SerializedName("signatureInitialsMode") private SignatureInitialsModes signatureInitialsMode = null; public FlowActionEditModel flowActionId(UUID flowActionId) { diff --git a/src/main/java/com/lacunasoftware/signer/flowactions/FlowActionModel.java b/src/main/java/com/lacunasoftware/signer/flowactions/FlowActionModel.java index 62dd13b..5842229 100644 --- a/src/main/java/com/lacunasoftware/signer/flowactions/FlowActionModel.java +++ b/src/main/java/com/lacunasoftware/signer/flowactions/FlowActionModel.java @@ -12,110 +12,138 @@ package com.lacunasoftware.signer.flowactions; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.ActionStatus; import com.lacunasoftware.signer.CertificateHolderTypes; import com.lacunasoftware.signer.CertificateTypes; -import com.lacunasoftware.signer.documentmark.DocumentMarkPositionModel; import com.lacunasoftware.signer.FlowActionType; -import com.lacunasoftware.signer.flowactions.SignRuleUserModel; import com.lacunasoftware.signer.SignatureInitialsModes; +import com.lacunasoftware.signer.documentmark.DocumentMarkPositionModel; import com.lacunasoftware.signer.users.ParticipantUserModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import org.threeten.bp.OffsetDateTime; /** * FlowActionModel */ public class FlowActionModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - - @JsonProperty("creationDate") + + @JsonProperty("creationDate") + @SerializedName("creationDate") private OffsetDateTime creationDate = null; - - @JsonProperty("pendingDate") + + @JsonProperty("pendingDate") + @SerializedName("pendingDate") private OffsetDateTime pendingDate = null; - - @JsonProperty("updateDate") + + @JsonProperty("updateDate") + @SerializedName("updateDate") private OffsetDateTime updateDate = null; - - @JsonProperty("user") + + @JsonProperty("user") + @SerializedName("user") private ParticipantUserModel user = null; - - @JsonProperty("numberRequiredSignatures") + + @JsonProperty("numberRequiredSignatures") + @SerializedName("numberRequiredSignatures") private Integer numberRequiredSignatures = null; - - @JsonProperty("signRuleUsers") + + @JsonProperty("signRuleUsers") + @SerializedName("signRuleUsers") private List signRuleUsers = null; - - @JsonProperty("marks") + + @JsonProperty("marks") + @SerializedName("marks") private List marks = null; - - @JsonProperty("allowElectronicSignature") + + @JsonProperty("allowElectronicSignature") + @SerializedName("allowElectronicSignature") private Boolean allowElectronicSignature = null; - - @JsonProperty("requireSmsAuthenticationToSignElectronically") + + @JsonProperty("requireSmsAuthenticationToSignElectronically") + @SerializedName("requireSmsAuthenticationToSignElectronically") private Boolean requireSmsAuthenticationToSignElectronically = null; - - @JsonProperty("requireAuthenticatorAppToSignElectronically") + + @JsonProperty("requireAuthenticatorAppToSignElectronically") + @SerializedName("requireAuthenticatorAppToSignElectronically") private Boolean requireAuthenticatorAppToSignElectronically = null; - - @JsonProperty("requireSelfieAuthenticationToSignElectronically") + + @JsonProperty("requireSelfieAuthenticationToSignElectronically") + @SerializedName("requireSelfieAuthenticationToSignElectronically") private Boolean requireSelfieAuthenticationToSignElectronically = null; - - @JsonProperty("requireDatavalidAuthenticationToSignElectronically") + + @JsonProperty("requireDatavalidAuthenticationToSignElectronically") + @SerializedName("requireDatavalidAuthenticationToSignElectronically") private Boolean requireDatavalidAuthenticationToSignElectronically = null; - - @JsonProperty("requirePixAuthenticationToSignElectronically") + + @JsonProperty("requirePixAuthenticationToSignElectronically") + @SerializedName("requirePixAuthenticationToSignElectronically") private Boolean requirePixAuthenticationToSignElectronically = null; - - @JsonProperty("requiredCertificateTypeToSign") + + @JsonProperty("requiredCertificateTypeToSign") + @SerializedName("requiredCertificateTypeToSign") private CertificateTypes requiredCertificateTypeToSign = null; - - @JsonProperty("requireCompanyCertificate") + + @JsonProperty("requireCompanyCertificate") + @SerializedName("requireCompanyCertificate") private Boolean requireCompanyCertificate = null; - - @JsonProperty("requiredCompanyIdentifier") + + @JsonProperty("requiredCompanyIdentifier") + @SerializedName("requiredCompanyIdentifier") private String requiredCompanyIdentifier = null; - - @JsonProperty("requiredCertificateHolderTypeToSign") + + @JsonProperty("requiredCertificateHolderTypeToSign") + @SerializedName("requiredCertificateHolderTypeToSign") private CertificateHolderTypes requiredCertificateHolderTypeToSign = null; - - @JsonProperty("refusalReason") + + @JsonProperty("refusalReason") + @SerializedName("refusalReason") private String refusalReason = null; - - @JsonProperty("signatureInitialsMode") + + @JsonProperty("signatureInitialsMode") + @SerializedName("signatureInitialsMode") private SignatureInitialsModes signatureInitialsMode = null; - - @JsonProperty("isElectronic") + + @JsonProperty("isElectronic") + @SerializedName("isElectronic") private Boolean isElectronic = null; - - @JsonProperty("allowRuleFlowToContinueIfRefused") + + @JsonProperty("allowRuleFlowToContinueIfRefused") + @SerializedName("allowRuleFlowToContinueIfRefused") private Boolean allowRuleFlowToContinueIfRefused = null; - - @JsonProperty("type") + + @JsonProperty("type") + @SerializedName("type") private FlowActionType type = null; - - @JsonProperty("status") + + @JsonProperty("status") + @SerializedName("status") private ActionStatus status = null; - - @JsonProperty("step") + + @JsonProperty("step") + @SerializedName("step") private Integer step = null; - - @JsonProperty("ruleName") + + @JsonProperty("ruleName") + @SerializedName("ruleName") private String ruleName = null; - - @JsonProperty("title") + + @JsonProperty("title") + @SerializedName("title") private String title = null; + public FlowActionModel id(UUID id) { this.id = id; diff --git a/src/main/java/com/lacunasoftware/signer/flowactions/PendingActionModel.java b/src/main/java/com/lacunasoftware/signer/flowactions/PendingActionModel.java index 735ac7d..e633978 100644 --- a/src/main/java/com/lacunasoftware/signer/flowactions/PendingActionModel.java +++ b/src/main/java/com/lacunasoftware/signer/flowactions/PendingActionModel.java @@ -13,26 +13,30 @@ package com.lacunasoftware.signer.flowactions; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * Contains the ids of the pending actions if there are any. */ @Schema(description = "Contains the ids of the pending actions if there are any.") public class PendingActionModel { - @JsonProperty("signerId") + @JsonProperty("signerId") + @SerializedName("signerId") private UUID signerId = null; - - @JsonProperty("signRuleId") + + @JsonProperty("signRuleId") + @SerializedName("signRuleId") private UUID signRuleId = null; - - @JsonProperty("approverId") + + @JsonProperty("approverId") + @SerializedName("approverId") private UUID approverId = null; + public PendingActionModel signerId(UUID signerId) { this.signerId = signerId; diff --git a/src/main/java/com/lacunasoftware/signer/flowactions/RectifiedParticipantModel.java b/src/main/java/com/lacunasoftware/signer/flowactions/RectifiedParticipantModel.java index bcaac9d..1ef92b7 100644 --- a/src/main/java/com/lacunasoftware/signer/flowactions/RectifiedParticipantModel.java +++ b/src/main/java/com/lacunasoftware/signer/flowactions/RectifiedParticipantModel.java @@ -13,27 +13,31 @@ package com.lacunasoftware.signer.flowactions; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.users.ParticipantUserModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * RectifiedParticipantModel */ public class RectifiedParticipantModel { - @JsonProperty("userId") + @JsonProperty("userId") + @SerializedName("userId") private UUID userId = null; - - @JsonProperty("requested") + + @JsonProperty("requested") + @SerializedName("requested") private ParticipantUserModel requested = null; - - @JsonProperty("rectified") + + @JsonProperty("rectified") + @SerializedName("rectified") private ParticipantUserModel rectified = null; + public RectifiedParticipantModel userId(UUID userId) { this.userId = userId; diff --git a/src/main/java/com/lacunasoftware/signer/flowactions/SignRuleUserEditModel.java b/src/main/java/com/lacunasoftware/signer/flowactions/SignRuleUserEditModel.java index a239ed4..369841a 100644 --- a/src/main/java/com/lacunasoftware/signer/flowactions/SignRuleUserEditModel.java +++ b/src/main/java/com/lacunasoftware/signer/flowactions/SignRuleUserEditModel.java @@ -13,22 +13,24 @@ package com.lacunasoftware.signer.flowactions; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * SignRuleUserEditModel */ public class SignRuleUserEditModel { - @JsonProperty("userId") + @JsonProperty("userId") + @SerializedName("userId") private UUID userId = null; - @JsonProperty("emailAddress") + @JsonProperty("emailAddress") + @SerializedName("emailAddress") private String emailAddress = null; public SignRuleUserEditModel userId(UUID userId) { diff --git a/src/main/java/com/lacunasoftware/signer/flowactions/SignRuleUserModel.java b/src/main/java/com/lacunasoftware/signer/flowactions/SignRuleUserModel.java index c1b236e..11fd196 100644 --- a/src/main/java/com/lacunasoftware/signer/flowactions/SignRuleUserModel.java +++ b/src/main/java/com/lacunasoftware/signer/flowactions/SignRuleUserModel.java @@ -13,48 +13,60 @@ package com.lacunasoftware.signer.flowactions; import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.v3.oas.annotations.media.Schema; import java.util.UUID; + import org.threeten.bp.OffsetDateTime; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; + +import io.swagger.v3.oas.annotations.media.Schema; /** * SignRuleUserModel */ public class SignRuleUserModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - - @JsonProperty("name") + + @JsonProperty("name") + @SerializedName("name") private String name = null; - - @JsonProperty("identifier") + + @JsonProperty("identifier") + @SerializedName("identifier") private String identifier = null; - - @JsonProperty("email") + + @JsonProperty("email") + @SerializedName("email") private String email = null; - - @JsonProperty("phone") + + @JsonProperty("phone") + @SerializedName("phone") private String phone = null; - - @JsonProperty("signatureDate") + + @JsonProperty("signatureDate") + @SerializedName("signatureDate") private OffsetDateTime signatureDate = null; - - @JsonProperty("isElectronic") + + @JsonProperty("isElectronic") + @SerializedName("isElectronic") private Boolean isElectronic = null; - - @JsonProperty("refusalDate") + + @JsonProperty("refusalDate") + @SerializedName("refusalDate") private OffsetDateTime refusalDate = null; - - @JsonProperty("hasRefused") + + @JsonProperty("hasRefused") + @SerializedName("hasRefused") private Boolean hasRefused = null; - - @JsonProperty("refusalReason") + + @JsonProperty("refusalReason") + @SerializedName("refusalReason") private String refusalReason = null; + public SignRuleUserModel id(UUID id) { this.id = id; diff --git a/src/main/java/com/lacunasoftware/signer/flowactions/SignatureModel.java b/src/main/java/com/lacunasoftware/signer/flowactions/SignatureModel.java index e5e392a..67d70e0 100644 --- a/src/main/java/com/lacunasoftware/signer/flowactions/SignatureModel.java +++ b/src/main/java/com/lacunasoftware/signer/flowactions/SignatureModel.java @@ -13,35 +13,37 @@ package com.lacunasoftware.signer.flowactions; import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.v3.oas.annotations.media.Schema; import java.util.UUID; + import org.threeten.bp.OffsetDateTime; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; + +import io.swagger.v3.oas.annotations.media.Schema; /** * SignatureModel */ public class SignatureModel { - @JsonProperty("flowActionId") + @JsonProperty("flowActionId") + @SerializedName("flowActionId") private UUID flowActionId = null; - - @JsonProperty("date") + @JsonProperty("date") + @SerializedName("date") private OffsetDateTime date = null; - - @JsonProperty("userId") + @JsonProperty("userId") + @SerializedName("userId") private UUID userId = null; - - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") private String name = null; - - @JsonProperty("identifier") + @JsonProperty("identifier") + @SerializedName("identifier") private String identifier = null; - - @JsonProperty("emailAddress") + @JsonProperty("emailAddress") + @SerializedName("emailAddress") private String emailAddress = null; public SignatureModel flowActionId(UUID flowActionId) { diff --git a/src/main/java/com/lacunasoftware/signer/flowactions/XadesOptionsModel.java b/src/main/java/com/lacunasoftware/signer/flowactions/XadesOptionsModel.java index 9fea679..ad060d7 100644 --- a/src/main/java/com/lacunasoftware/signer/flowactions/XadesOptionsModel.java +++ b/src/main/java/com/lacunasoftware/signer/flowactions/XadesOptionsModel.java @@ -13,13 +13,13 @@ package com.lacunasoftware.signer.flowactions; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.XadesElementIdentifierTypes; import com.lacunasoftware.signer.XadesInsertionOptions; import com.lacunasoftware.signer.XadesSignatureTypes; + import io.swagger.v3.oas.annotations.media.Schema; /** * XadesOptionsModel @@ -27,20 +27,26 @@ public class XadesOptionsModel { - @JsonProperty("signatureType") + @JsonProperty("signatureType") + @SerializedName("signatureType") private XadesSignatureTypes signatureType = null; - - @JsonProperty("elementToSignIdentifierType") + + @JsonProperty("elementToSignIdentifierType") + @SerializedName("elementToSignIdentifierType") private XadesElementIdentifierTypes elementToSignIdentifierType = null; - - @JsonProperty("elementToSignIdentifier") + + @JsonProperty("elementToSignIdentifier") + @SerializedName("elementToSignIdentifier") private String elementToSignIdentifier = null; - - @JsonProperty("insertionOption") + + @JsonProperty("insertionOption") + @SerializedName("insertionOption") private XadesInsertionOptions insertionOption = null; - - @JsonProperty("disableXPathTransformation") + + @JsonProperty("disableXPathTransformation") + @SerializedName("disableXPathTransformation") private Boolean disableXPathTransformation = null; + public XadesOptionsModel signatureType(XadesSignatureTypes signatureType) { this.signatureType = signatureType; diff --git a/src/main/java/com/lacunasoftware/signer/folders/FolderCreateRequest.java b/src/main/java/com/lacunasoftware/signer/folders/FolderCreateRequest.java index 859a494..e4cee5f 100644 --- a/src/main/java/com/lacunasoftware/signer/folders/FolderCreateRequest.java +++ b/src/main/java/com/lacunasoftware/signer/folders/FolderCreateRequest.java @@ -13,22 +13,24 @@ package com.lacunasoftware.signer.folders; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * FolderCreateRequest */ public class FolderCreateRequest { - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") private String name = null; - @JsonProperty("parentId") + @JsonProperty("parentId") + @SerializedName("parentId") private UUID parentId = null; public FolderCreateRequest name(String name) { diff --git a/src/main/java/com/lacunasoftware/signer/folders/FolderDeleteRequest.java b/src/main/java/com/lacunasoftware/signer/folders/FolderDeleteRequest.java index d5e0270..0824abb 100644 --- a/src/main/java/com/lacunasoftware/signer/folders/FolderDeleteRequest.java +++ b/src/main/java/com/lacunasoftware/signer/folders/FolderDeleteRequest.java @@ -13,23 +13,25 @@ package com.lacunasoftware.signer.folders; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.DeleteAction; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * FolderDeleteRequest */ public class FolderDeleteRequest { - @JsonProperty("deleteAction") + @JsonProperty("deleteAction") + @SerializedName("deleteAction") private DeleteAction deleteAction = null; - @JsonProperty("destinationFolderId") + @JsonProperty("destinationFolderId") + @SerializedName("destinationFolderId") private UUID destinationFolderId = null; public FolderDeleteRequest deleteAction(DeleteAction deleteAction) { diff --git a/src/main/java/com/lacunasoftware/signer/folders/FolderInfoModel.java b/src/main/java/com/lacunasoftware/signer/folders/FolderInfoModel.java index b7ab068..1c7ffa9 100644 --- a/src/main/java/com/lacunasoftware/signer/folders/FolderInfoModel.java +++ b/src/main/java/com/lacunasoftware/signer/folders/FolderInfoModel.java @@ -13,27 +13,31 @@ package com.lacunasoftware.signer.folders; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * FolderInfoModel */ public class FolderInfoModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") private String name = null; - @JsonProperty("parentId") + @JsonProperty("parentId") + @SerializedName("parentId") private UUID parentId = null; + public FolderInfoModel id(UUID id) { this.id = id; return this; diff --git a/src/main/java/com/lacunasoftware/signer/folders/FolderOrganizationModel.java b/src/main/java/com/lacunasoftware/signer/folders/FolderOrganizationModel.java index 84958fa..d3d48ea 100644 --- a/src/main/java/com/lacunasoftware/signer/folders/FolderOrganizationModel.java +++ b/src/main/java/com/lacunasoftware/signer/folders/FolderOrganizationModel.java @@ -13,30 +13,35 @@ package com.lacunasoftware.signer.folders; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.organizations.OrganizationInfoModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * FolderOrganizationModel */ public class FolderOrganizationModel { - @JsonProperty("organization") + @JsonProperty("organization") + @SerializedName("organization") private OrganizationInfoModel organization = null; - - @JsonProperty("id") + + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - - @JsonProperty("name") + + @JsonProperty("name") + @SerializedName("name") private String name = null; - - @JsonProperty("parentId") + + @JsonProperty("parentId") + @SerializedName("parentId") private UUID parentId = null; + public FolderOrganizationModel organization(OrganizationInfoModel organization) { this.organization = organization; diff --git a/src/main/java/com/lacunasoftware/signer/healthdocuments/HealthDocumentData.java b/src/main/java/com/lacunasoftware/signer/healthdocuments/HealthDocumentData.java index a773d44..3e9262f 100644 --- a/src/main/java/com/lacunasoftware/signer/healthdocuments/HealthDocumentData.java +++ b/src/main/java/com/lacunasoftware/signer/healthdocuments/HealthDocumentData.java @@ -12,26 +12,26 @@ package com.lacunasoftware.signer.healthdocuments; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.healthdocuments.HealthItemModel; -import com.lacunasoftware.signer.healthdocuments.HealthProfessionalModel; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * This option is only valid for the following document types: Prescription, MedicalCertificate, ExamRequest, LabReport, DischargeSummary, ClinicalRecord, DrugDispensing, Vaccination and MedicalReport */ @Schema(description = "This option is only valid for the following document types: Prescription, MedicalCertificate, ExamRequest, LabReport, DischargeSummary, ClinicalRecord, DrugDispensing, Vaccination and MedicalReport") public class HealthDocumentData { - @JsonProperty("professional") + @JsonProperty("professional") + @SerializedName("professional") private HealthProfessionalModel professional = null; - - @JsonProperty("items") + + @JsonProperty("items") + @SerializedName("items") private List items = null; public HealthDocumentData professional(HealthProfessionalModel professional) { diff --git a/src/main/java/com/lacunasoftware/signer/healthdocuments/HealthItemModel.java b/src/main/java/com/lacunasoftware/signer/healthdocuments/HealthItemModel.java index cf197ee..056ba7e 100644 --- a/src/main/java/com/lacunasoftware/signer/healthdocuments/HealthItemModel.java +++ b/src/main/java/com/lacunasoftware/signer/healthdocuments/HealthItemModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.healthdocuments; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * HealthItemModel @@ -24,14 +24,18 @@ public class HealthItemModel { - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") private String name = null; - - @JsonProperty("description") + + @JsonProperty("description") + @SerializedName("description") private String description = null; - - @JsonProperty("description2") + + @JsonProperty("description2") + @SerializedName("description2") private String description2 = null; + public HealthItemModel name(String name) { this.name = name; diff --git a/src/main/java/com/lacunasoftware/signer/healthdocuments/HealthProfessionalModel.java b/src/main/java/com/lacunasoftware/signer/healthdocuments/HealthProfessionalModel.java index 061c334..4806554 100644 --- a/src/main/java/com/lacunasoftware/signer/healthdocuments/HealthProfessionalModel.java +++ b/src/main/java/com/lacunasoftware/signer/healthdocuments/HealthProfessionalModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.healthdocuments; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * HealthProfessionalModel @@ -24,11 +24,14 @@ public class HealthProfessionalModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private String id = null; - - @JsonProperty("region") + + @JsonProperty("region") + @SerializedName("region") private String region = null; + public HealthProfessionalModel id(String id) { this.id = id; diff --git a/src/main/java/com/lacunasoftware/signer/invoices/InvoiceTotalModel.java b/src/main/java/com/lacunasoftware/signer/invoices/InvoiceTotalModel.java index df7b9dd..c5cca8d 100644 --- a/src/main/java/com/lacunasoftware/signer/invoices/InvoiceTotalModel.java +++ b/src/main/java/com/lacunasoftware/signer/invoices/InvoiceTotalModel.java @@ -13,12 +13,12 @@ package com.lacunasoftware.signer.invoices; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.TransactionTypes; import com.lacunasoftware.signer.transactions.TransactionPriceModel; + import io.swagger.v3.oas.annotations.media.Schema; /** * InvoiceTotalModel @@ -26,21 +26,27 @@ public class InvoiceTotalModel { - @JsonProperty("transactionType") + @JsonProperty("transactionType") + @SerializedName("transactionType") private TransactionTypes transactionType = null; - @JsonProperty("price") + @JsonProperty("price") + @SerializedName("price") private TransactionPriceModel price = null; - @JsonProperty("total") + @JsonProperty("total") + @SerializedName("total") private Integer total = null; - @JsonProperty("totalInTrialPeriod") + @JsonProperty("totalInTrialPeriod") + @SerializedName("totalInTrialPeriod") private Integer totalInTrialPeriod = null; - @JsonProperty("value") + @JsonProperty("value") + @SerializedName("value") private Double value = null; + public InvoiceTotalModel transactionType(TransactionTypes transactionType) { this.transactionType = transactionType; return this; diff --git a/src/main/java/com/lacunasoftware/signer/invoices/UpdateInvoicePaymentStatusRequest.java b/src/main/java/com/lacunasoftware/signer/invoices/UpdateInvoicePaymentStatusRequest.java index 18f5e81..425e68e 100644 --- a/src/main/java/com/lacunasoftware/signer/invoices/UpdateInvoicePaymentStatusRequest.java +++ b/src/main/java/com/lacunasoftware/signer/invoices/UpdateInvoicePaymentStatusRequest.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.invoices; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * UpdateInvoicePaymentStatusRequest @@ -24,7 +24,8 @@ public class UpdateInvoicePaymentStatusRequest { - @JsonProperty("isPaid") + @JsonProperty("isPaid") + @SerializedName("isPaid") private Boolean isPaid = null; public UpdateInvoicePaymentStatusRequest isPaid(Boolean isPaid) { diff --git a/src/main/java/com/lacunasoftware/signer/javaclient/RestClient.java b/src/main/java/com/lacunasoftware/signer/javaclient/RestClient.java index af2ce6e..e0bf02d 100644 --- a/src/main/java/com/lacunasoftware/signer/javaclient/RestClient.java +++ b/src/main/java/com/lacunasoftware/signer/javaclient/RestClient.java @@ -23,13 +23,13 @@ import java.net.HttpURLConnection; import java.net.URI; import java.net.URL; -import java.util.Objects; import java.util.Scanner; import java.lang.reflect.Type; import com.lacunasoftware.signer.javaclient.exceptions.RestErrorException; import com.lacunasoftware.signer.javaclient.exceptions.RestException; import com.lacunasoftware.signer.javaclient.exceptions.RestUnreachableException; +import com.lacunasoftware.signer.EnumTypeAdapterFactory; import com.lacunasoftware.signer.javaclient.exceptions.RestDecodeException; import com.lacunasoftware.signer.javaclient.exceptions.RestResourceNotFoundException; import com.lacunasoftware.signer.javaclient.models.RestGeneralErrorModel; @@ -351,9 +351,10 @@ private void checkResponse(String verb, String url, HttpURLConnection conn) thro } } else if(statusCode == 400){ - Scanner scanner = new Scanner(conn.getErrorStream()); - String errorBody = scanner.nextLine(); - ex = new RestErrorException(verb, url, statusCode, errorBody); + try (Scanner scanner = new Scanner(conn.getErrorStream())) { + String errorBody = scanner.nextLine(); + ex = new RestErrorException(verb, url, statusCode, errorBody); + } }else { RestGeneralErrorModel model = readErrorResponse(conn, RestGeneralErrorModel.class); @@ -410,6 +411,7 @@ protected Gson getGson() { Gson gson = new GsonBuilder() .registerTypeAdapter(OffsetDateTime.class, new OffsetDateTimeDeserializer()) + .registerTypeAdapterFactory(new EnumTypeAdapterFactory()) .create(); return gson; } diff --git a/src/main/java/com/lacunasoftware/signer/javaclient/SignerClient.java b/src/main/java/com/lacunasoftware/signer/javaclient/SignerClient.java index 4001a5b..e53b854 100644 --- a/src/main/java/com/lacunasoftware/signer/javaclient/SignerClient.java +++ b/src/main/java/com/lacunasoftware/signer/javaclient/SignerClient.java @@ -5,7 +5,6 @@ import com.google.gson.reflect.TypeToken; import java.io.*; -import java.lang.reflect.Field; import java.net.URI; import java.net.URISyntaxException; import java.net.URLEncoder; diff --git a/src/main/java/com/lacunasoftware/signer/javaclient/builders/AttachmentUploadBuilder.java b/src/main/java/com/lacunasoftware/signer/javaclient/builders/AttachmentUploadBuilder.java index 5913938..51ceafb 100644 --- a/src/main/java/com/lacunasoftware/signer/javaclient/builders/AttachmentUploadBuilder.java +++ b/src/main/java/com/lacunasoftware/signer/javaclient/builders/AttachmentUploadBuilder.java @@ -1,6 +1,5 @@ package com.lacunasoftware.signer.javaclient.builders; -import com.lacunasoftware.signer.FileUploadModel; import com.lacunasoftware.signer.attachments.AttachmentUploadModel; import com.lacunasoftware.signer.javaclient.models.UploadModel; diff --git a/src/main/java/com/lacunasoftware/signer/javaclient/models/UploadModel.java b/src/main/java/com/lacunasoftware/signer/javaclient/models/UploadModel.java index b35df9b..0275ec2 100644 --- a/src/main/java/com/lacunasoftware/signer/javaclient/models/UploadModel.java +++ b/src/main/java/com/lacunasoftware/signer/javaclient/models/UploadModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.javaclient.models; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * UploadModel @@ -24,15 +24,19 @@ public class UploadModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") protected String id = null; - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") protected String name = null; - @JsonProperty("contentType") + @JsonProperty("contentType") + @SerializedName("contentType") protected String contentType = null; + public UploadModel id(String id) { this.id = id; return this; diff --git a/src/main/java/com/lacunasoftware/signer/notifications/CreateFlowActionReminderRequest.java b/src/main/java/com/lacunasoftware/signer/notifications/CreateFlowActionReminderRequest.java index 1f25468..13a0b07 100644 --- a/src/main/java/com/lacunasoftware/signer/notifications/CreateFlowActionReminderRequest.java +++ b/src/main/java/com/lacunasoftware/signer/notifications/CreateFlowActionReminderRequest.java @@ -13,23 +13,26 @@ package com.lacunasoftware.signer.notifications; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * CreateFlowActionReminderRequest */ public class CreateFlowActionReminderRequest { - @JsonProperty("documentId") + @JsonProperty("documentId") + @SerializedName("documentId") private UUID documentId = null; - - @JsonProperty("flowActionId") + + @JsonProperty("flowActionId") + @SerializedName("flowActionId") private UUID flowActionId = null; + public CreateFlowActionReminderRequest documentId(UUID documentId) { this.documentId = documentId; diff --git a/src/main/java/com/lacunasoftware/signer/notifications/EmailListNotificationRequest.java b/src/main/java/com/lacunasoftware/signer/notifications/EmailListNotificationRequest.java index d5b5efe..69c66cc 100644 --- a/src/main/java/com/lacunasoftware/signer/notifications/EmailListNotificationRequest.java +++ b/src/main/java/com/lacunasoftware/signer/notifications/EmailListNotificationRequest.java @@ -12,21 +12,22 @@ package com.lacunasoftware.signer.notifications; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * EmailListNotificationRequest */ public class EmailListNotificationRequest { - @JsonProperty("emails") + @JsonProperty("emails") + @SerializedName("emails") private List emails = new ArrayList(); public EmailListNotificationRequest emails(List emails) { diff --git a/src/main/java/com/lacunasoftware/signer/observers/ObserverCreateModel.java b/src/main/java/com/lacunasoftware/signer/observers/ObserverCreateModel.java index 38db5d3..d773056 100644 --- a/src/main/java/com/lacunasoftware/signer/observers/ObserverCreateModel.java +++ b/src/main/java/com/lacunasoftware/signer/observers/ObserverCreateModel.java @@ -13,10 +13,8 @@ package com.lacunasoftware.signer.observers; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.users.ParticipantUserModel; import io.swagger.v3.oas.annotations.media.Schema; /** @@ -25,7 +23,8 @@ public class ObserverCreateModel { - @JsonProperty("user") + @JsonProperty("user") + @SerializedName("user") private ParticipantUserModel user = null; public ObserverCreateModel user(ParticipantUserModel user) { diff --git a/src/main/java/com/lacunasoftware/signer/observers/ObserverEditModel.java b/src/main/java/com/lacunasoftware/signer/observers/ObserverEditModel.java index 984c527..59f01a1 100644 --- a/src/main/java/com/lacunasoftware/signer/observers/ObserverEditModel.java +++ b/src/main/java/com/lacunasoftware/signer/observers/ObserverEditModel.java @@ -13,23 +13,26 @@ package com.lacunasoftware.signer.observers; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * ObserverEditModel */ public class ObserverEditModel { - @JsonProperty("observerId") + @JsonProperty("observerId") + @SerializedName("observerId") private UUID observerId = null; - - @JsonProperty("emailAddress") + + @JsonProperty("emailAddress") + @SerializedName("emailAddress") private String emailAddress = null; + public ObserverEditModel observerId(UUID observerId) { this.observerId = observerId; diff --git a/src/main/java/com/lacunasoftware/signer/observers/ObserverModel.java b/src/main/java/com/lacunasoftware/signer/observers/ObserverModel.java index 9f6bcbc..0f855f6 100644 --- a/src/main/java/com/lacunasoftware/signer/observers/ObserverModel.java +++ b/src/main/java/com/lacunasoftware/signer/observers/ObserverModel.java @@ -13,24 +13,27 @@ package com.lacunasoftware.signer.observers; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.users.ParticipantUserModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * ObserverModel */ public class ObserverModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - - @JsonProperty("user") + + @JsonProperty("user") + @SerializedName("user") private ParticipantUserModel user = null; + public ObserverModel id(UUID id) { this.id = id; diff --git a/src/main/java/com/lacunasoftware/signer/organizations/AccessProfileModel.java b/src/main/java/com/lacunasoftware/signer/organizations/AccessProfileModel.java index 991b5d7..e6ea0c3 100644 --- a/src/main/java/com/lacunasoftware/signer/organizations/AccessProfileModel.java +++ b/src/main/java/com/lacunasoftware/signer/organizations/AccessProfileModel.java @@ -13,10 +13,9 @@ package com.lacunasoftware.signer.organizations; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * AccessProfileModel @@ -24,15 +23,19 @@ public class AccessProfileModel { - @JsonProperty("administrator") + @JsonProperty("administrator") + @SerializedName("administrator") private Boolean administrator = null; - @JsonProperty("manager") + @JsonProperty("manager") + @SerializedName("manager") private Boolean manager = null; - @JsonProperty("operator") + @JsonProperty("operator") + @SerializedName("operator") private Boolean operator = null; + public AccessProfileModel administrator(Boolean administrator) { this.administrator = administrator; return this; diff --git a/src/main/java/com/lacunasoftware/signer/organizations/OrganizationInfoModel.java b/src/main/java/com/lacunasoftware/signer/organizations/OrganizationInfoModel.java index 8944d98..e6ccf77 100644 --- a/src/main/java/com/lacunasoftware/signer/organizations/OrganizationInfoModel.java +++ b/src/main/java/com/lacunasoftware/signer/organizations/OrganizationInfoModel.java @@ -13,31 +13,35 @@ package com.lacunasoftware.signer.organizations; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.organizations.OrganizationOwnerInfoModel; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * OrganizationInfoModel */ public class OrganizationInfoModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") private String name = null; - @JsonProperty("identifier") + @JsonProperty("identifier") + @SerializedName("identifier") private String identifier = null; - @JsonProperty("owner") + @JsonProperty("owner") + @SerializedName("owner") private OrganizationOwnerInfoModel owner = null; + public OrganizationInfoModel id(UUID id) { this.id = id; return this; diff --git a/src/main/java/com/lacunasoftware/signer/organizations/OrganizationOwnerInfoModel.java b/src/main/java/com/lacunasoftware/signer/organizations/OrganizationOwnerInfoModel.java index 44cb81b..b78bb82 100644 --- a/src/main/java/com/lacunasoftware/signer/organizations/OrganizationOwnerInfoModel.java +++ b/src/main/java/com/lacunasoftware/signer/organizations/OrganizationOwnerInfoModel.java @@ -13,24 +13,27 @@ package com.lacunasoftware.signer.organizations; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * OrganizationOwnerInfoModel */ public class OrganizationOwnerInfoModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") private String name = null; + public OrganizationOwnerInfoModel id(UUID id) { this.id = id; return this; diff --git a/src/main/java/com/lacunasoftware/signer/organizations/OrganizationUserModel.java b/src/main/java/com/lacunasoftware/signer/organizations/OrganizationUserModel.java index 8e7d473..894fc3b 100644 --- a/src/main/java/com/lacunasoftware/signer/organizations/OrganizationUserModel.java +++ b/src/main/java/com/lacunasoftware/signer/organizations/OrganizationUserModel.java @@ -13,34 +13,39 @@ package com.lacunasoftware.signer.organizations; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.organizations.AccessProfileModel; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * OrganizationUserModel */ public class OrganizationUserModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") private String name = null; - @JsonProperty("email") + @JsonProperty("email") + @SerializedName("email") private String email = null; - @JsonProperty("identifier") + @JsonProperty("identifier") + @SerializedName("identifier") private String identifier = null; - @JsonProperty("accessProfile") + @JsonProperty("accessProfile") + @SerializedName("accessProfile") private AccessProfileModel accessProfile = null; + public OrganizationUserModel id(UUID id) { this.id = id; return this; diff --git a/src/main/java/com/lacunasoftware/signer/organizations/OrganizationUserPostRequest.java b/src/main/java/com/lacunasoftware/signer/organizations/OrganizationUserPostRequest.java index e0ff629..5a9e6f0 100644 --- a/src/main/java/com/lacunasoftware/signer/organizations/OrganizationUserPostRequest.java +++ b/src/main/java/com/lacunasoftware/signer/organizations/OrganizationUserPostRequest.java @@ -13,37 +13,43 @@ package com.lacunasoftware.signer.organizations; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.organizations.AccessProfileModel; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * OrganizationUserPostRequest */ public class OrganizationUserPostRequest { - @JsonProperty("accessProfile") + @JsonProperty("accessProfile") + @SerializedName("accessProfile") private AccessProfileModel accessProfile = null; - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") private String name = null; - @JsonProperty("identifier") + @JsonProperty("identifier") + @SerializedName("identifier") private String identifier = null; - @JsonProperty("email") + @JsonProperty("email") + @SerializedName("email") private String email = null; - @JsonProperty("phone") + @JsonProperty("phone") + @SerializedName("phone") private String phone = null; + public OrganizationUserPostRequest accessProfile(AccessProfileModel accessProfile) { this.accessProfile = accessProfile; return this; diff --git a/src/main/java/com/lacunasoftware/signer/refusal/RefusalModel.java b/src/main/java/com/lacunasoftware/signer/refusal/RefusalModel.java index 8924667..7fe6c1d 100644 --- a/src/main/java/com/lacunasoftware/signer/refusal/RefusalModel.java +++ b/src/main/java/com/lacunasoftware/signer/refusal/RefusalModel.java @@ -13,10 +13,9 @@ package com.lacunasoftware.signer.refusal; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; import java.util.UUID; import org.threeten.bp.OffsetDateTime; @@ -26,25 +25,33 @@ public class RefusalModel { - @JsonProperty("flowActionId") + @JsonProperty("flowActionId") + @SerializedName("flowActionId") + private UUID flowActionId = null; + @JsonProperty("reason") + @SerializedName("reason") - @JsonProperty("reason") private String reason = null; + @JsonProperty("date") + @SerializedName("date") - @JsonProperty("date") private OffsetDateTime date = null; + @JsonProperty("userId") + @SerializedName("userId") - @JsonProperty("userId") private UUID userId = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("identifier") + @SerializedName("identifier") - @JsonProperty("identifier") private String identifier = null; + @JsonProperty("emailAddress") + @SerializedName("emailAddress") - @JsonProperty("emailAddress") private String emailAddress = null; public RefusalModel flowActionId(UUID flowActionId) { diff --git a/src/main/java/com/lacunasoftware/signer/refusal/RefusalRequest.java b/src/main/java/com/lacunasoftware/signer/refusal/RefusalRequest.java index f567c07..73e4b7f 100644 --- a/src/main/java/com/lacunasoftware/signer/refusal/RefusalRequest.java +++ b/src/main/java/com/lacunasoftware/signer/refusal/RefusalRequest.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.refusal; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * RefusalRequest @@ -24,7 +24,8 @@ public class RefusalRequest { - @JsonProperty("reason") + @JsonProperty("reason") + @SerializedName("reason") private String reason = null; public RefusalRequest reason(String reason) { diff --git a/src/main/java/com/lacunasoftware/signer/securitycontexts/AuthenticationTypesModel.java b/src/main/java/com/lacunasoftware/signer/securitycontexts/AuthenticationTypesModel.java index e4a1d85..cbfaabc 100644 --- a/src/main/java/com/lacunasoftware/signer/securitycontexts/AuthenticationTypesModel.java +++ b/src/main/java/com/lacunasoftware/signer/securitycontexts/AuthenticationTypesModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.securitycontexts; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * AuthenticationTypesModel @@ -24,27 +24,35 @@ public class AuthenticationTypesModel { - @JsonProperty("sms") + @JsonProperty("sms") + @SerializedName("sms") private Boolean sms = null; - @JsonProperty("whatsapp") + @JsonProperty("whatsapp") + @SerializedName("whatsapp") private Boolean whatsapp = null; - @JsonProperty("otp") + @JsonProperty("otp") + @SerializedName("otp") private Boolean otp = null; - @JsonProperty("selfie") + @JsonProperty("selfie") + @SerializedName("selfie") private Boolean selfie = null; - @JsonProperty("datavalid") + @JsonProperty("datavalid") + @SerializedName("datavalid") private Boolean datavalid = null; - @JsonProperty("pix") + @JsonProperty("pix") + @SerializedName("pix") private Boolean pix = null; - @JsonProperty("email") + @JsonProperty("email") + @SerializedName("email") private Boolean email = null; + public AuthenticationTypesModel sms(Boolean sms) { this.sms = sms; return this; diff --git a/src/main/java/com/lacunasoftware/signer/securitycontexts/SecurityContextSimpleModel.java b/src/main/java/com/lacunasoftware/signer/securitycontexts/SecurityContextSimpleModel.java index 5922643..14739ee 100644 --- a/src/main/java/com/lacunasoftware/signer/securitycontexts/SecurityContextSimpleModel.java +++ b/src/main/java/com/lacunasoftware/signer/securitycontexts/SecurityContextSimpleModel.java @@ -13,40 +13,47 @@ package com.lacunasoftware.signer.securitycontexts; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.securitycontexts.AuthenticationTypesModel; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * SecurityContextSimpleModel */ public class SecurityContextSimpleModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") private String name = null; - @JsonProperty("englishName") + @JsonProperty("englishName") + @SerializedName("englishName") private String englishName = null; - @JsonProperty("portugueseName") + @JsonProperty("portugueseName") + @SerializedName("portugueseName") private String portugueseName = null; - @JsonProperty("spanishName") + @JsonProperty("spanishName") + @SerializedName("spanishName") private String spanishName = null; - @JsonProperty("allowDigitalSignature") + @JsonProperty("allowDigitalSignature") + @SerializedName("allowDigitalSignature") private Boolean allowDigitalSignature = null; - @JsonProperty("allowedElectronicTypes") + @JsonProperty("allowedElectronicTypes") + @SerializedName("allowedElectronicTypes") private AuthenticationTypesModel allowedElectronicTypes = null; + public SecurityContextSimpleModel id(UUID id) { this.id = id; return this; diff --git a/src/main/java/com/lacunasoftware/signer/signature/DatavalidSelfieValidationResponse.java b/src/main/java/com/lacunasoftware/signer/signature/DatavalidSelfieValidationResponse.java index f0ef225..972fc65 100644 --- a/src/main/java/com/lacunasoftware/signer/signature/DatavalidSelfieValidationResponse.java +++ b/src/main/java/com/lacunasoftware/signer/signature/DatavalidSelfieValidationResponse.java @@ -13,11 +13,11 @@ package com.lacunasoftware.signer.signature; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.Probability; + import io.swagger.v3.oas.annotations.media.Schema; /** * DatavalidSelfieValidationResponse @@ -25,15 +25,19 @@ public class DatavalidSelfieValidationResponse { - @JsonProperty("available") + @JsonProperty("available") +@SerializedName("available") private Boolean available = null; - @JsonProperty("probability") + @JsonProperty("probability") + @SerializedName("probability") private Probability probability = null; - @JsonProperty("similarity") + @JsonProperty("similarity") + @SerializedName("similarity") private Float similarity = null; + public DatavalidSelfieValidationResponse available(Boolean available) { this.available = available; return this; diff --git a/src/main/java/com/lacunasoftware/signer/signature/EvidencesModel.java b/src/main/java/com/lacunasoftware/signer/signature/EvidencesModel.java index c84f16d..48da0bd 100644 --- a/src/main/java/com/lacunasoftware/signer/signature/EvidencesModel.java +++ b/src/main/java/com/lacunasoftware/signer/signature/EvidencesModel.java @@ -12,68 +12,82 @@ package com.lacunasoftware.signer.signature; -import java.util.Objects; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.applications.ApplicationDisplayModel; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.AuthenticationTypes; -import com.lacunasoftware.signer.signature.GeolocationModel; -import com.lacunasoftware.signer.signature.PixAuthenticationModel; -import com.lacunasoftware.signer.signature.SelfieModel; +import com.lacunasoftware.signer.applications.ApplicationDisplayModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; -import org.threeten.bp.OffsetDateTime; /** * EvidencesModel */ public class EvidencesModel { - @JsonProperty("ipAddress") + @JsonProperty("ipAddress") + @SerializedName("ipAddress") private String ipAddress = null; - @JsonProperty("authenticationTypes") + @JsonProperty("authenticationTypes") + @SerializedName("authenticationTypes") private List authenticationTypes = null; - @JsonProperty("accountVerifiedEmail") + @JsonProperty("accountVerifiedEmail") + @SerializedName("accountVerifiedEmail") private String accountVerifiedEmail = null; - @JsonProperty("authenticatedEmail") + @JsonProperty("authenticatedEmail") + @SerializedName("authenticatedEmail") private String authenticatedEmail = null; - @JsonProperty("authenticatedPhoneNumberLastDigits") + @JsonProperty("authenticatedPhoneNumberLastDigits") + @SerializedName("authenticatedPhoneNumberLastDigits") private String authenticatedPhoneNumberLastDigits = null; - @JsonProperty("authenticatedApplication") + @JsonProperty("authenticatedApplication") + @SerializedName("authenticatedApplication") private ApplicationDisplayModel authenticatedApplication = null; - @JsonProperty("authenticatedSelfie") + @JsonProperty("authenticatedSelfie") + @SerializedName("authenticatedSelfie") private SelfieModel authenticatedSelfie = null; - @JsonProperty("authenticatedPix") + @JsonProperty("authenticatedPix") + @SerializedName("authenticatedPix") private PixAuthenticationModel authenticatedPix = null; - @JsonProperty("geolocation") + @JsonProperty("geolocation") + @SerializedName("geolocation") private GeolocationModel geolocation = null; - @JsonProperty("timestamp") + @JsonProperty("timestamp") + @SerializedName("timestamp") private OffsetDateTime timestamp = null; - @JsonProperty("evidencesSha256") + @JsonProperty("evidencesSha256") + @SerializedName("evidencesSha256") private String evidencesSha256 = null; - @JsonProperty("authenticatedPhoneNumber") + @JsonProperty("authenticatedPhoneNumber") + @SerializedName("authenticatedPhoneNumber") private String authenticatedPhoneNumber = null; - @JsonProperty("file") + @JsonProperty("file") + @SerializedName("file") private byte[] file = null; - @JsonProperty("fileTicket") + @JsonProperty("fileTicket") + @SerializedName("fileTicket") private String fileTicket = null; + public EvidencesModel ipAddress(String ipAddress) { this.ipAddress = ipAddress; return this; diff --git a/src/main/java/com/lacunasoftware/signer/signature/GeolocationModel.java b/src/main/java/com/lacunasoftware/signer/signature/GeolocationModel.java index 5fb3b1e..ad40814 100644 --- a/src/main/java/com/lacunasoftware/signer/signature/GeolocationModel.java +++ b/src/main/java/com/lacunasoftware/signer/signature/GeolocationModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.signature; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * GeolocationModel @@ -24,15 +24,19 @@ public class GeolocationModel { - @JsonProperty("latitude") + @JsonProperty("latitude") + @SerializedName("latitude") private Double latitude = null; - @JsonProperty("longitude") + @JsonProperty("longitude") + @SerializedName("longitude") private Double longitude = null; - @JsonProperty("accuracy") + @JsonProperty("accuracy") + @SerializedName("accuracy") private Double accuracy = null; + public GeolocationModel latitude(Double latitude) { this.latitude = latitude; return this; diff --git a/src/main/java/com/lacunasoftware/signer/signature/PixAuthenticationModel.java b/src/main/java/com/lacunasoftware/signer/signature/PixAuthenticationModel.java index 31aa9b8..329f06f 100644 --- a/src/main/java/com/lacunasoftware/signer/signature/PixAuthenticationModel.java +++ b/src/main/java/com/lacunasoftware/signer/signature/PixAuthenticationModel.java @@ -13,25 +13,30 @@ package com.lacunasoftware.signer.signature; import java.util.Objects; -import java.util.Arrays; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import org.threeten.bp.OffsetDateTime; /** * PixAuthenticationModel */ public class PixAuthenticationModel { - @JsonProperty("endToEndId") + + @JsonProperty("endToEndId") + @SerializedName("endToEndId") private String endToEndId = null; - - @JsonProperty("pixKey") + + @JsonProperty("pixKey") + @SerializedName("pixKey") private String pixKey = null; - - @JsonProperty("paymentDate") + + @JsonProperty("paymentDate") + @SerializedName("paymentDate") private OffsetDateTime paymentDate = null; public PixAuthenticationModel endToEndId(String endToEndId) { diff --git a/src/main/java/com/lacunasoftware/signer/signature/SelfieModel.java b/src/main/java/com/lacunasoftware/signer/signature/SelfieModel.java index 2ef6976..af9e5d4 100644 --- a/src/main/java/com/lacunasoftware/signer/signature/SelfieModel.java +++ b/src/main/java/com/lacunasoftware/signer/signature/SelfieModel.java @@ -13,31 +13,35 @@ package com.lacunasoftware.signer.signature; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.signature.DatavalidSelfieValidationResponse; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * SelfieModel */ public class SelfieModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - @JsonProperty("contentB64") + @JsonProperty("contentB64") + @SerializedName("contentB64") private String contentB64 = null; - @JsonProperty("mimeType") + @JsonProperty("mimeType") + @SerializedName("mimeType") private String mimeType = null; - @JsonProperty("validationResponse") + @JsonProperty("validationResponse") + @SerializedName("validationResponse") private DatavalidSelfieValidationResponse validationResponse = null; + public SelfieModel id(UUID id) { this.id = id; return this; diff --git a/src/main/java/com/lacunasoftware/signer/signature/SignaturesInfoRequest.java b/src/main/java/com/lacunasoftware/signer/signature/SignaturesInfoRequest.java index 5a20cff..87d881f 100644 --- a/src/main/java/com/lacunasoftware/signer/signature/SignaturesInfoRequest.java +++ b/src/main/java/com/lacunasoftware/signer/signature/SignaturesInfoRequest.java @@ -13,22 +13,24 @@ package com.lacunasoftware.signer.signature; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; /** * SignaturesInfoRequest */ public class SignaturesInfoRequest { - @JsonProperty("fileId") + @JsonProperty("fileId") + @SerializedName("fileId") private UUID fileId = null; - @JsonProperty("mimeType") + @JsonProperty("mimeType") + @SerializedName("mimeType") private String mimeType = null; public SignaturesInfoRequest fileId(UUID fileId) { diff --git a/src/main/java/com/lacunasoftware/signer/transactions/PriceRangeModel.java b/src/main/java/com/lacunasoftware/signer/transactions/PriceRangeModel.java index e4227cd..c579f56 100644 --- a/src/main/java/com/lacunasoftware/signer/transactions/PriceRangeModel.java +++ b/src/main/java/com/lacunasoftware/signer/transactions/PriceRangeModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.transactions; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * PriceRangeModel @@ -24,10 +24,12 @@ public class PriceRangeModel { - @JsonProperty("limit") + @JsonProperty("limit") + @SerializedName("limit") private Integer limit = null; - @JsonProperty("price") + @JsonProperty("price") + @SerializedName("price") private Double price = null; public PriceRangeModel limit(Integer limit) { diff --git a/src/main/java/com/lacunasoftware/signer/transactions/TransactionPriceModel.java b/src/main/java/com/lacunasoftware/signer/transactions/TransactionPriceModel.java index 23a4106..330097a 100644 --- a/src/main/java/com/lacunasoftware/signer/transactions/TransactionPriceModel.java +++ b/src/main/java/com/lacunasoftware/signer/transactions/TransactionPriceModel.java @@ -12,36 +12,40 @@ package com.lacunasoftware.signer.transactions; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.TransactionPricingTypes; import com.lacunasoftware.signer.TransactionTypes; -import com.lacunasoftware.signer.transactions.PriceRangeModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * TransactionPriceModel */ public class TransactionPriceModel { - @JsonProperty("transactionType") + @JsonProperty("transactionType") + @SerializedName("transactionType") private TransactionTypes transactionType = null; - @JsonProperty("pricingType") + @JsonProperty("pricingType") + @SerializedName("pricingType") private TransactionPricingTypes pricingType = null; - @JsonProperty("price") + @JsonProperty("price") + @SerializedName("price") private Double price = null; - - @JsonProperty("priceRanges") + + @JsonProperty("priceRanges") + @SerializedName("priceRanges") private List priceRanges = null; - @JsonProperty("limit") + @JsonProperty("limit") + @SerializedName("limit") private Integer limit = null; public TransactionPriceModel transactionType(TransactionTypes transactionType) { diff --git a/src/main/java/com/lacunasoftware/signer/uploads/UploadBytesModel.java b/src/main/java/com/lacunasoftware/signer/uploads/UploadBytesModel.java index bd1446d..1c46b18 100644 --- a/src/main/java/com/lacunasoftware/signer/uploads/UploadBytesModel.java +++ b/src/main/java/com/lacunasoftware/signer/uploads/UploadBytesModel.java @@ -13,10 +13,10 @@ package com.lacunasoftware.signer.uploads; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * UploadBytesModel @@ -24,15 +24,19 @@ public class UploadBytesModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private String id = null; - @JsonProperty("size") + @JsonProperty("size") + @SerializedName("size") private Long size = null; - @JsonProperty("digest") + @JsonProperty("digest") + @SerializedName("digest") private String digest = null; + public UploadBytesModel id(String id) { this.id = id; return this; diff --git a/src/main/java/com/lacunasoftware/signer/uploads/UploadBytesRequest.java b/src/main/java/com/lacunasoftware/signer/uploads/UploadBytesRequest.java index 5e4df2b..b4e46e7 100644 --- a/src/main/java/com/lacunasoftware/signer/uploads/UploadBytesRequest.java +++ b/src/main/java/com/lacunasoftware/signer/uploads/UploadBytesRequest.java @@ -12,11 +12,12 @@ package com.lacunasoftware.signer.uploads; -import java.util.Objects; import java.util.Arrays; +import java.util.Objects; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; /** * UploadBytesRequest @@ -24,7 +25,8 @@ public class UploadBytesRequest { - @JsonProperty("bytes") + @JsonProperty("bytes") + @SerializedName("bytes") private byte[] bytes = null; public UploadBytesRequest bytes(byte[] bytes) { diff --git a/src/main/java/com/lacunasoftware/signer/users/ParticipantUserModel.java b/src/main/java/com/lacunasoftware/signer/users/ParticipantUserModel.java index bca4d73..a9af665 100644 --- a/src/main/java/com/lacunasoftware/signer/users/ParticipantUserModel.java +++ b/src/main/java/com/lacunasoftware/signer/users/ParticipantUserModel.java @@ -13,10 +13,9 @@ package com.lacunasoftware.signer.users; import java.util.Objects; -import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; import java.util.UUID; /** @@ -25,19 +24,25 @@ public class ParticipantUserModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") + private UUID id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("identifier") + @SerializedName("identifier") - @JsonProperty("identifier") private String identifier = null; + @JsonProperty("email") + @SerializedName("email") - @JsonProperty("email") private String email = null; + @JsonProperty("phone") + @SerializedName("phone") - @JsonProperty("phone") private String phone = null; public ParticipantUserModel id(UUID id) { diff --git a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentApprovedModel.java b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentApprovedModel.java index 6786b7d..9d049a6 100644 --- a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentApprovedModel.java +++ b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentApprovedModel.java @@ -13,45 +13,55 @@ package com.lacunasoftware.signer.webhooks; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.documents.CreatorModel; import com.lacunasoftware.signer.flowactions.ApprovalModel; import com.lacunasoftware.signer.folders.FolderInfoModel; import com.lacunasoftware.signer.organizations.OrganizationInfoModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; -import org.threeten.bp.OffsetDateTime; /** * DocumentApprovedModel */ public class DocumentApprovedModel { - @JsonProperty("approval") + @JsonProperty("approval") + @SerializedName("approval") + private ApprovalModel approval = null; + @JsonProperty("id") + @SerializedName("id") - @JsonProperty("id") private UUID id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("creationDate") + @SerializedName("creationDate") - @JsonProperty("creationDate") private OffsetDateTime creationDate = null; + @JsonProperty("updateDate") + @SerializedName("updateDate") - @JsonProperty("updateDate") private OffsetDateTime updateDate = null; + @JsonProperty("folder") + @SerializedName("folder") - @JsonProperty("folder") private FolderInfoModel folder = null; + @JsonProperty("organization") + @SerializedName("organization") - @JsonProperty("organization") private OrganizationInfoModel organization = null; + @JsonProperty("createdBy") + @SerializedName("createdBy") - @JsonProperty("createdBy") private CreatorModel createdBy = null; public DocumentApprovedModel approval(ApprovalModel approval) { diff --git a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentCanceledModel.java b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentCanceledModel.java index 26ec42e..c6d15df 100644 --- a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentCanceledModel.java +++ b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentCanceledModel.java @@ -13,48 +13,59 @@ package com.lacunasoftware.signer.webhooks; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.agents.AgentModel; import com.lacunasoftware.signer.documents.CreatorModel; import com.lacunasoftware.signer.folders.FolderInfoModel; import com.lacunasoftware.signer.organizations.OrganizationInfoModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; -import org.threeten.bp.OffsetDateTime; /** * DocumentCanceledModel */ public class DocumentCanceledModel { - @JsonProperty("canceledBy") + @JsonProperty("canceledBy") + @SerializedName("canceledBy") + private AgentModel canceledBy = null; + @JsonProperty("reason") + @SerializedName("reason") - @JsonProperty("reason") private String reason = null; + @JsonProperty("id") + @SerializedName("id") - @JsonProperty("id") private UUID id = null; + @JsonProperty("name") + @SerializedName("name") - @JsonProperty("name") private String name = null; + @JsonProperty("creationDate") + @SerializedName("creationDate") - @JsonProperty("creationDate") private OffsetDateTime creationDate = null; + @JsonProperty("updateDate") + @SerializedName("updateDate") - @JsonProperty("updateDate") private OffsetDateTime updateDate = null; + @JsonProperty("folder") + @SerializedName("folder") - @JsonProperty("folder") private FolderInfoModel folder = null; + @JsonProperty("organization") + @SerializedName("organization") - @JsonProperty("organization") private OrganizationInfoModel organization = null; + @JsonProperty("createdBy") + @SerializedName("createdBy") - @JsonProperty("createdBy") private CreatorModel createdBy = null; public DocumentCanceledModel canceledBy(AgentModel canceledBy) { diff --git a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentConcludedModel.java b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentConcludedModel.java index b503cff..976357a 100644 --- a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentConcludedModel.java +++ b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentConcludedModel.java @@ -13,42 +13,51 @@ package com.lacunasoftware.signer.webhooks; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.documents.CreatorModel; import com.lacunasoftware.signer.folders.FolderInfoModel; import com.lacunasoftware.signer.organizations.OrganizationInfoModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; -import org.threeten.bp.OffsetDateTime; /** * DocumentConcludedModel */ public class DocumentConcludedModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - - @JsonProperty("name") + + @JsonProperty("name") + @SerializedName("name") private String name = null; - - @JsonProperty("creationDate") + + @JsonProperty("creationDate") + @SerializedName("creationDate") private OffsetDateTime creationDate = null; - - @JsonProperty("updateDate") + + @JsonProperty("updateDate") + @SerializedName("updateDate") private OffsetDateTime updateDate = null; - - @JsonProperty("folder") + + @JsonProperty("folder") + @SerializedName("folder") private FolderInfoModel folder = null; - - @JsonProperty("organization") + + @JsonProperty("organization") + @SerializedName("organization") private OrganizationInfoModel organization = null; - - @JsonProperty("createdBy") + + @JsonProperty("createdBy") + @SerializedName("createdBy") private CreatorModel createdBy = null; + public DocumentConcludedModel id(UUID id) { this.id = id; diff --git a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentInformationModel.java b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentInformationModel.java index 77f6241..71f8a33 100644 --- a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentInformationModel.java +++ b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentInformationModel.java @@ -13,43 +13,52 @@ package com.lacunasoftware.signer.webhooks; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.documents.CreatorModel; import com.lacunasoftware.signer.folders.FolderInfoModel; import com.lacunasoftware.signer.organizations.OrganizationInfoModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; -import org.threeten.bp.OffsetDateTime; /** * DocumentInformationModel */ public class DocumentInformationModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") private String name = null; - @JsonProperty("creationDate") + @JsonProperty("creationDate") + @SerializedName("creationDate") private OffsetDateTime creationDate = null; - @JsonProperty("updateDate") + @JsonProperty("updateDate") + @SerializedName("updateDate") private OffsetDateTime updateDate = null; - @JsonProperty("folder") + @JsonProperty("folder") + @SerializedName("folder") private FolderInfoModel folder = null; - @JsonProperty("organization") + @JsonProperty("organization") + @SerializedName("organization") private OrganizationInfoModel organization = null; - @JsonProperty("createdBy") + @JsonProperty("createdBy") + @SerializedName("createdBy") private CreatorModel createdBy = null; + public DocumentInformationModel id(UUID id) { this.id = id; return this; diff --git a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentRefusedModel.java b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentRefusedModel.java index b264a01..883aecb 100644 --- a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentRefusedModel.java +++ b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentRefusedModel.java @@ -13,47 +13,57 @@ package com.lacunasoftware.signer.webhooks; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.documents.CreatorModel; import com.lacunasoftware.signer.folders.FolderInfoModel; import com.lacunasoftware.signer.organizations.OrganizationInfoModel; import com.lacunasoftware.signer.refusal.RefusalModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; -import org.threeten.bp.OffsetDateTime; /** * DocumentRefusedModel */ public class DocumentRefusedModel { - @JsonProperty("refusal") + @JsonProperty("refusal") + @SerializedName("refusal") private RefusalModel refusal = null; - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") private String name = null; - @JsonProperty("creationDate") + @JsonProperty("creationDate") + @SerializedName("creationDate") private OffsetDateTime creationDate = null; - @JsonProperty("updateDate") + @JsonProperty("updateDate") + @SerializedName("updateDate") private OffsetDateTime updateDate = null; - @JsonProperty("folder") + @JsonProperty("folder") + @SerializedName("folder") private FolderInfoModel folder = null; - @JsonProperty("organization") + @JsonProperty("organization") + @SerializedName("organization") private OrganizationInfoModel organization = null; - @JsonProperty("createdBy") + @JsonProperty("createdBy") + @SerializedName("createdBy") private CreatorModel createdBy = null; + public DocumentRefusedModel refusal(RefusalModel refusal) { this.refusal = refusal; return this; diff --git a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentSignedModel.java b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentSignedModel.java index 0fae6e7..8b15182 100644 --- a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentSignedModel.java +++ b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentSignedModel.java @@ -13,47 +13,57 @@ package com.lacunasoftware.signer.webhooks; import java.util.Objects; -import java.util.Arrays; +import java.util.UUID; + +import org.threeten.bp.OffsetDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.documents.CreatorModel; import com.lacunasoftware.signer.flowactions.SignatureModel; import com.lacunasoftware.signer.folders.FolderInfoModel; import com.lacunasoftware.signer.organizations.OrganizationInfoModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; -import org.threeten.bp.OffsetDateTime; /** * DocumentSignedModel */ public class DocumentSignedModel { - @JsonProperty("signature") + @JsonProperty("signature") + @SerializedName("signature") private SignatureModel signature = null; - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private UUID id = null; - @JsonProperty("name") + @JsonProperty("name") + @SerializedName("name") private String name = null; - @JsonProperty("creationDate") + @JsonProperty("creationDate") + @SerializedName("creationDate") private OffsetDateTime creationDate = null; - @JsonProperty("updateDate") + @JsonProperty("updateDate") + @SerializedName("updateDate") private OffsetDateTime updateDate = null; - @JsonProperty("folder") + @JsonProperty("folder") + @SerializedName("folder") private FolderInfoModel folder = null; - @JsonProperty("organization") + @JsonProperty("organization") + @SerializedName("organization") private OrganizationInfoModel organization = null; - @JsonProperty("createdBy") + @JsonProperty("createdBy") + @SerializedName("createdBy") private CreatorModel createdBy = null; + public DocumentSignedModel signature(SignatureModel signature) { this.signature = signature; return this; diff --git a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentsCreatedModel.java b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentsCreatedModel.java index 400f079..cf5bc3f 100644 --- a/src/main/java/com/lacunasoftware/signer/webhooks/DocumentsCreatedModel.java +++ b/src/main/java/com/lacunasoftware/signer/webhooks/DocumentsCreatedModel.java @@ -12,22 +12,22 @@ package com.lacunasoftware.signer.webhooks; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.lacunasoftware.signer.webhooks.DocumentInformationModel; +import com.google.gson.annotations.SerializedName; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * DocumentsCreatedModel */ public class DocumentsCreatedModel { - @JsonProperty("documents") + @JsonProperty("documents") + @SerializedName("documents") private List documents = null; public DocumentsCreatedModel documents(List documents) { diff --git a/src/main/java/com/lacunasoftware/signer/webhooks/InvoiceClosedModel.java b/src/main/java/com/lacunasoftware/signer/webhooks/InvoiceClosedModel.java index 02a0d49..c56047b 100644 --- a/src/main/java/com/lacunasoftware/signer/webhooks/InvoiceClosedModel.java +++ b/src/main/java/com/lacunasoftware/signer/webhooks/InvoiceClosedModel.java @@ -12,44 +12,52 @@ package com.lacunasoftware.signer.webhooks; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.billing.BillingInformationModel; import com.lacunasoftware.signer.invoices.InvoiceTotalModel; import com.lacunasoftware.signer.organizations.OrganizationInfoModel; + import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; /** * InvoiceClosedModel */ public class InvoiceClosedModel { - @JsonProperty("id") + @JsonProperty("id") + @SerializedName("id") private Integer id = null; - @JsonProperty("month") + @JsonProperty("month") + @SerializedName("month") private Integer month = null; - @JsonProperty("year") + @JsonProperty("year") + @SerializedName("year") private Integer year = null; - @JsonProperty("value") + @JsonProperty("value") + @SerializedName("value") private Double value = null; - @JsonProperty("invoiceTotals") + @JsonProperty("invoiceTotals") + @SerializedName("invoiceTotals") private List invoiceTotals = null; - @JsonProperty("organization") + @JsonProperty("organization") + @SerializedName("organization") private OrganizationInfoModel organization = null; - @JsonProperty("billingInformation") + @JsonProperty("billingInformation") + @SerializedName("billingInformation") private BillingInformationModel billingInformation = null; + public InvoiceClosedModel id(Integer id) { this.id = id; return this; diff --git a/src/main/java/com/lacunasoftware/signer/webhooks/WebhookModel.java b/src/main/java/com/lacunasoftware/signer/webhooks/WebhookModel.java index 46424f2..ea0c11f 100644 --- a/src/main/java/com/lacunasoftware/signer/webhooks/WebhookModel.java +++ b/src/main/java/com/lacunasoftware/signer/webhooks/WebhookModel.java @@ -13,11 +13,11 @@ package com.lacunasoftware.signer.webhooks; import java.util.Objects; -import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.google.gson.annotations.SerializedName; import com.lacunasoftware.signer.WebhookTypes; + import io.swagger.v3.oas.annotations.media.Schema; /** * WebhookModel @@ -25,12 +25,15 @@ public class WebhookModel { - @JsonProperty("type") + @JsonProperty("type") + @SerializedName("type") private WebhookTypes type = null; - @JsonProperty("data") + @JsonProperty("data") + @SerializedName("data") private Object data = null; + public WebhookModel type(WebhookTypes type) { this.type = type; return this;