Updating openapi-generator for Java v2 to 7.8.0

sandbox/java-v2/pom.xml

@@ -22,6 +22,12 @@
             <scope>system</scope>
             <systemPath>${pom.basedir}/artifacts/dropbox-sign.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

sandbox/java-v2/src/test/com/dropbox/sign_sandbox/.config.dist.json

@@ -0,0 +1,6 @@
+{
+  "BASE_URL": "https://api.hellosign.com/v3",
+  "API_KEY": "",
+  "CLIENT_ID": "",
+  "USE_XDEBUG": 0
+}

sandbox/java-v2/src/test/com/dropbox/sign_sandbox/.gitignore

@@ -0,0 +1 @@
+.config.json

sandbox/java-v2/src/test/com/dropbox/sign_sandbox/SignatureRequestTest.java

@@ -0,0 +1,148 @@
+package com.dropbox.sign_sandbox;
+
+import com.dropbox.sign.ApiClient;
+import com.dropbox.sign.ApiException;
+import com.dropbox.sign.Configuration;
+import com.dropbox.sign.JSON;
+import com.dropbox.sign.api.EmbeddedApi;
+import com.dropbox.sign.api.SignatureRequestApi;
+import com.dropbox.sign.model.*;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+public class SignatureRequestTest {
+    public static JsonNode getConfig() throws Exception {
+        ObjectMapper objectMapper = JSON.getDefault().getMapper();
+
+        JsonNode configCustom = objectMapper.readTree(Files.newInputStream(
+            Paths.get("src/test/com/dropbox/sign_sandbox/.config.json")
+        ));
+        JsonNode configDist = objectMapper.readTree(Files.newInputStream(
+            Paths.get("src/test/com/dropbox/sign_sandbox/.config.dist.json")
+        ));
+
+        ObjectReader updater = objectMapper.readerForUpdating(configDist);
+
+        return updater.readValue(configCustom);
+    }
+
+    public static JsonNode getJsonContents(String filename) throws Exception {
+        ObjectMapper objectMapper = JSON.getDefault().getMapper();
+        return objectMapper.readTree(Files.newInputStream(
+            Paths.get("test_fixtures/" + filename)
+        ));
+    }
+
+    @Test
+    public void testSend() throws Exception {
+        JsonNode config = getConfig();
+
+        ApiClient apiClient = Configuration.getDefaultApiClient()
+            .setApiKey(config.findPath("API_KEY").textValue())
+            .setBasePath(config.findPath("BASE_URL").textValue());
+
+        SignatureRequestApi signatureRequestApi = new SignatureRequestApi(apiClient);
+
+        JsonNode data = getJsonContents("SignatureRequestSendRequest.json");
+
+        SignatureRequestSendRequest sendRequest = SignatureRequestSendRequest.init(data.toString());
+        sendRequest.addFilesItem(new File("test_fixtures/pdf-sample.pdf"));
+
+        SignatureRequestGetResponse sendResponse = signatureRequestApi.signatureRequestSend(sendRequest);
+
+        Assert.assertEquals(
+            sendRequest.getFormFieldsPerDocument().get(0).getApiId(),
+            sendResponse.getSignatureRequest().getCustomFields().get(0).getApiId()
+        );
+
+        Assert.assertEquals(
+            sendRequest.getSigners().get(0).getEmailAddress(),
+            sendResponse.getSignatureRequest().getSignatures().get(0).getSignerEmailAddress()
+        );
+        Assert.assertEquals(
+            sendRequest.getSigners().get(1).getEmailAddress(),
+            sendResponse.getSignatureRequest().getSignatures().get(1).getSignerEmailAddress()
+        );
+        Assert.assertEquals(
+            sendRequest.getSigners().get(2).getEmailAddress(),
+            sendResponse.getSignatureRequest().getSignatures().get(2).getSignerEmailAddress()
+        );
+
+        SignatureRequestGetResponse getResponse = signatureRequestApi.signatureRequestGet(
+            sendResponse.getSignatureRequest().getSignatureRequestId()
+        );
+
+        Assert.assertEquals(
+            sendResponse.getSignatureRequest().getSignatureRequestId(),
+            getResponse.getSignatureRequest().getSignatureRequestId()
+        );
+    }
+
+    @Test
+    public void testCreateEmbedded() throws Exception {
+        JsonNode config = getConfig();
+
+        ApiClient apiClient = Configuration.getDefaultApiClient()
+            .setApiKey(config.findPath("API_KEY").textValue())
+            .setBasePath(config.findPath("BASE_URL").textValue());
+
+        SignatureRequestApi signatureRequestApi = new SignatureRequestApi(apiClient);
+
+        JsonNode data = getJsonContents("SignatureRequestCreateEmbeddedRequest.json");
+
+        SignatureRequestCreateEmbeddedRequest sendRequest = SignatureRequestCreateEmbeddedRequest.init(data.toString());
+        sendRequest.addFilesItem(new File("test_fixtures/pdf-sample.pdf"));
+        sendRequest.clientId(config.findPath("CLIENT_ID").textValue());
+
+        SignatureRequestGetResponse sendResponse = signatureRequestApi.signatureRequestCreateEmbedded(sendRequest);
+
+        Assert.assertEquals(
+            sendRequest.getSigners().get(0).getEmailAddress(),
+            sendResponse.getSignatureRequest().getSignatures().get(0).getSignerEmailAddress()
+        );
+        Assert.assertEquals(
+            sendRequest.getSigners().get(1).getEmailAddress(),
+            sendResponse.getSignatureRequest().getSignatures().get(1).getSignerEmailAddress()
+        );
+        Assert.assertEquals(
+            sendRequest.getSigners().get(2).getEmailAddress(),
+            sendResponse.getSignatureRequest().getSignatures().get(2).getSignerEmailAddress()
+        );
+
+        EmbeddedApi embeddedApi = new EmbeddedApi(apiClient);
+
+        EmbeddedSignUrlResponse getResponse = embeddedApi.embeddedSignUrl(
+            sendResponse.getSignatureRequest().getSignatures().get(0).getSignatureId()
+        );
+
+        Assert.assertNotNull(getResponse.getEmbedded().getSignUrl());
+    }
+
+    @Test
+    public void testSendWithoutFileError() throws Exception {
+        JsonNode config = getConfig();
+
+        ApiClient apiClient = Configuration.getDefaultApiClient()
+            .setApiKey(config.findPath("API_KEY").textValue())
+            .setBasePath(config.findPath("BASE_URL").textValue());
+
+        SignatureRequestApi signatureRequestApi = new SignatureRequestApi(apiClient);
+
+        JsonNode data = getJsonContents("SignatureRequestSendRequest.json");
+        SignatureRequestSendRequest sendRequest = SignatureRequestSendRequest.init(data.toString());
+
+        try {
+            signatureRequestApi.signatureRequestSend(sendRequest);
+            Assert.fail();
+        } catch (ApiException e) {
+            Assert.assertEquals("file", e.getErrorResponse().getError().getErrorPath());
+        }
+    }
+}

sdks/java-v2/.github/workflows/maven.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8' ]
+        java: [ 17, 21 ]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
         distribution: 'temurin'

sdks/java-v2/.gitignore

@@ -18,12 +18,10 @@ hs_err_pid*
 **/target
 target
 .gradle
-build/
+build
 
 .composer
 vendor
-
-# Intellij
 .idea/
-
 .openapi-generator
+.github/workflows/maven.yml

sdks/java-v2/README.md

@@ -56,7 +56,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>com.dropbox.sign</groupId>
   <artifactId>dropbox-sign</artifactId>
-  <version>2.1-dev</version>
+  <version>2.2-dev</version>
   <scope>compile</scope>
 </dependency>
 ```
@@ -72,7 +72,7 @@ Add this dependency to your project's build file:
   }
 
   dependencies {
-     implementation "com.dropbox.sign:dropbox-sign:2.1-dev"
+     implementation "com.dropbox.sign:dropbox-sign:2.2-dev"
   }
 ```
 
@@ -86,7 +86,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-- `target/dropbox-sign-2.1-dev.jar`
+- `target/dropbox-sign-2.2-dev.jar`
 - `target/lib/*.jar`
 
 ## Getting Started
@@ -133,32 +133,6 @@ public class Example {
 ```
 
 
-  ## Using a Proxy
-
-  To add a HTTP proxy for the API client, use `ClientConfig`:
-
-  ```java
-
-    import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
-    import org.glassfish.jersey.client.ClientConfig;
-    import org.glassfish.jersey.client.ClientProperties;
-    import com.dropbox.sign.*;
-    import com.dropbox.sign.api.AccountApi;
-
-    ...
-
-    ApiClient defaultClient = Configuration.getDefaultApiClient();
-    ClientConfig clientConfig = defaultClient.getClientConfig();
-    clientConfig.connectorProvider(new ApacheConnectorProvider());
-    clientConfig.property(ClientProperties.PROXY_URI, "http://proxy_url_here");
-    clientConfig.property(ClientProperties.PROXY_USERNAME, "proxy_username");
-    clientConfig.property(ClientProperties.PROXY_PASSWORD, "proxy_password");
-    defaultClient.setClientConfig(clientConfig);
-
-    AccountApi apiInstance = new AccountApi(defaultClient);
-
-  ```
-
 
 ## Documentation for API Endpoints
 
@@ -419,18 +393,22 @@ Class | Method | HTTP request | Description
  - [WarningResponse](docs/WarningResponse.md)
 
 
+<a id="documentation-for-authorization"></a>
 ## Documentation for Authorization
 
+
 Authentication schemes defined for the API:
+<a id="api_key"></a>
 ### api_key
 
 
 - **Type**: HTTP basic authentication
 
+<a id="oauth2"></a>
 ### oauth2
 
 
-- **Type**: HTTP basic authentication
+- **Type**: HTTP Bearer Token authentication (JWT)
 
 
 ## Recommendation
@@ -447,7 +425,7 @@ apisupport@hellosign.com
 This Java package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: `3.0.0`
-    - Package version: `2.1-dev`
+    - Package version: `2.2-dev`
 - Build package: `org.openapitools.codegen.languages.JavaClientCodegen`
 
 

sdks/java-v2/VERSION

@@ -1 +1 @@
-2.1-dev
+2.2-dev

sdks/java-v2/build.gradle

@@ -1,3 +1,4 @@
+
 buildscript {
     repositories {
         mavenCentral()
@@ -20,7 +21,7 @@ apply plugin: 'signing'
 
 group = 'com.dropbox.sign'
 archivesBaseName = 'dropbox-sign'
-version = '2.1-dev'
+version = '2.2-dev'
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
@@ -116,12 +117,11 @@ publishing {
 
 ext {
     swagger_annotations_version = "1.6.5"
-    jackson_version = "2.13.4"
-    jackson_databind_version = "2.13.4.2"
+    jackson_version = "2.17.1"
+    jackson_databind_version = "2.17.1"
     jakarta_annotation_version = "2.1.0"
-    jackson_threetenbp_version = "2.9.10"
     jersey_version = "3.0.4"
-    junit_version = "4.13.1"
+    junit_version = "5.8.2"
     mockito_version = "3.12.4"
 }
 
@@ -137,12 +137,16 @@ dependencies {
     implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
-    implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
     testImplementation "org.mockito:mockito-core:$mockito_version"
 }
 
+test {
+    useJUnitPlatform()
+}
 
 javadoc {
     options.tags = [ "http.response.details:a:Http Response Details" ]

sdks/java-v2/build.sbt

@@ -2,26 +2,26 @@ lazy val root = (project in file(".")).
   settings(
     organization := "com.dropbox.sign",
     name := "dropbox-sign",
-    version := "2.1-dev",
+    version := "2.2-dev",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     Compile / javacOptions ++= Seq("-Xlint:deprecation"),
     Compile / packageDoc / publishArtifact := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
+      libraryDependencies += "commons-codec" % "commons-codec" % "1.15"
       "com.google.code.findbugs" % "jsr305" % "3.0.0",
       "io.swagger" % "swagger-annotations" % "1.6.5",
       "org.glassfish.jersey.core" % "jersey-client" % "3.0.4",
       "org.glassfish.jersey.inject" % "jersey-hk2" % "3.0.4",
       "org.glassfish.jersey.media" % "jersey-media-multipart" % "3.0.4",
       "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "3.0.4",
       "org.glassfish.jersey.connectors" % "jersey-apache-connector" % "3.0.4",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.13.4" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.4" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4.2" % "compile",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.13.2" % "compile",
-      "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.12.5" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.17.1" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.17.1" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.17.1" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.17.1" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "2.1.0" % "compile",
-      "junit" % "junit" % "4.13.2" % "test"
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.8.2" % "test"
     )
   )