Java generator improvements (#68)

Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com>

Author: fern-api[bot]

.github/workflows/ci.yml

@@ -54,7 +54,7 @@ jobs:
 
       - name: Publish to maven
         run: |
-          ./gradlew  publish
+          ./gradlew publish
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

LICENSE

@@ -0,0 +1,16 @@
+Last updated: April 21, 2022
+
+Merge SDK & Code Snippets License
+
+Merge makes available to Customers various software development kits ("SDKs") and code snippets ("Snippets") (together, the "Merge Assets") to assist with Merge Integrations and making connections to their Customer Application. Merge Assets are deemed Software under the MSA (defined below). All terms applicable to Software under the MSA apply with equal force and effect to the Merge Assets under this Merge SDK and Code Snippets License ("License").
+
+"Customer" means a person or entity that uses any of the Merge Assets. By using any Merge Asset, Customer agrees to the terms of this License.
+
+"MSA" for the purpose of this License means: (a) for Merge "Launch" Customers, the Subscriber Agreement (available at: https://merge.dev/subscriber-agreement); and (b) for Merge "Growth" and/or "Expand" Customers, Merge's Master Services Agreement (available at https://merge.dev/msa), unless Merge and Customer have entered into a separate written agreement governing the Customer's use of the Service. Customer's use of any Merge Asset will be governed by the applicable MSA as well as the additional terms of this License. Capitalized terms used but not defined herein shall have the meaning as set forth in the MSA. In the event of any inconsistency between the terms of the MSA and this License, the terms of the MSA will prevail.
+
+Merge reserves the right to modify or update this License in its sole discretion, the effective date of such updates and/or modifications will be the earlier of: (i) 30 days from the date of such update or modification; or (ii) Customer's continued use of any Merge Asset.
+
+SDK and Snippets License. Customer's right to access and use the Service under Section 1 of the MSA is extended to include use of the Merge Assets but solely during the Term and subject to the terms of the MSA.
+Use with the Service Only. Customer may use the Merge Assets but only in connections with the Service and Merge Integrations. Any other use of the Merge Assets requires Merge's prior written consent.
+Limitations. Customer's use of the Merge Assets may be subject to bandwidth limitations that Merge may impose from time to time during the Subscription. Merge will make commercially reasonable efforts to notify Customer of such limitations in advance via the location where Customer gained access to the applicable Merge Asset(s).
+Merge Assets & Intellectual Property Rights. Any modifications or derivatives (together, "Asset Derivatives") made by Customer to the Merge Assets are deemed "works made for hire" as that term is defined in the United States Copyright Act and are the sole property of Merge. To the extent that ownership of any Asset Derivative does not by operation of law vest in Merge, Customer hereby assigns to Merge all right, title and interest in and to the Asset Derivative, including all related intellectual property rights. Asset Derivatives will be governed by the terms of this License.

build.gradle

@@ -13,9 +13,9 @@ repositories {
 
 dependencies {
     api 'com.squareup.okhttp3:okhttp:4.12.0'
-    api 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
-    api 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3'
-    api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3'
+    api 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
+    api 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2'
+    api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }
@@ -24,31 +24,61 @@ dependencies {
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
+tasks.withType(Javadoc) {
+    failOnError false
+    options.addStringOption('Xdoclint:none', '-quiet')
+}
+
 spotless {
     java {
         palantirJavaFormat()
     }
 }
 
+
 java {
     withSourcesJar()
     withJavadocJar()
 }
 
+
+group = 'dev.merge'
+
+version = '1.1.0'
+
+jar {
+    dependsOn(":generatePomFileForMavenPublication")
+    archiveBaseName = "merge-java-client"
+}
+
+sourcesJar {
+    archiveBaseName = "merge-java-client"
+}
+
+javadocJar {
+    archiveBaseName = "merge-java-client"
+}
+
 test {
     useJUnitPlatform()
     testLogging {
         showStandardStreams = true
     }
 }
+
 publishing {
     publications {
         maven(MavenPublication) {
             groupId = 'dev.merge'
             artifactId = 'merge-java-client'
-            version = '1.0.18'
+            version = '1.1.0'
             from components.java
             pom {
+                licenses {
+                    license {
+                        name = 'CustomLicense{filename: LICENSE}'
+                    }
+                }
                 scm {
                     connection = 'scm:git:git://github.com/merge-api/merge-java-client.git'
                     developerConnection = 'scm:git:git://github.com/merge-api/merge-java-client.git'

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

gradlew.bat

@@ -1 +1,3 @@
+rootProject.name = 'merge-java-client'
+
 include 'sample-app'

settings.gradle

@@ -16,44 +16,44 @@
 public class MergeApiClient {
     protected final ClientOptions clientOptions;
 
-    protected final Supplier<AtsClient> atsClient;
-
     protected final Supplier<CrmClient> crmClient;
 
-    protected final Supplier<HrisClient> hrisClient;
+    protected final Supplier<AtsClient> atsClient;
 
     protected final Supplier<FilestorageClient> filestorageClient;
 
+    protected final Supplier<HrisClient> hrisClient;
+
     protected final Supplier<TicketingClient> ticketingClient;
 
     protected final Supplier<AccountingClient> accountingClient;
 
     public MergeApiClient(ClientOptions clientOptions) {
         this.clientOptions = clientOptions;
-        this.atsClient = Suppliers.memoize(() -> new AtsClient(clientOptions));
         this.crmClient = Suppliers.memoize(() -> new CrmClient(clientOptions));
-        this.hrisClient = Suppliers.memoize(() -> new HrisClient(clientOptions));
+        this.atsClient = Suppliers.memoize(() -> new AtsClient(clientOptions));
         this.filestorageClient = Suppliers.memoize(() -> new FilestorageClient(clientOptions));
+        this.hrisClient = Suppliers.memoize(() -> new HrisClient(clientOptions));
         this.ticketingClient = Suppliers.memoize(() -> new TicketingClient(clientOptions));
         this.accountingClient = Suppliers.memoize(() -> new AccountingClient(clientOptions));
     }
 
-    public AtsClient ats() {
-        return this.atsClient.get();
-    }
-
     public CrmClient crm() {
         return this.crmClient.get();
     }
 
-    public HrisClient hris() {
-        return this.hrisClient.get();
+    public AtsClient ats() {
+        return this.atsClient.get();
     }
 
     public FilestorageClient filestorage() {
         return this.filestorageClient.get();
     }
 
+    public HrisClient hris() {
+        return this.hrisClient.get();
+    }
+
     public TicketingClient ticketing() {
         return this.ticketingClient.get();
     }

src/main/java/com/merge/api/MergeApiClient.java

@@ -41,6 +41,14 @@ public MergeApiClientBuilder url(String url) {
         return this;
     }
 
+    /**
+     * Sets the timeout (in seconds) for the client
+     */
+    public MergeApiClientBuilder timeout(int timeout) {
+        this.clientOptionsBuilder.timeout(timeout);
+        return this;
+    }
+
     public MergeApiClient build() {
         if (apiKey == null) {
             throw new RuntimeException("Please provide apiKey");