Java SDK generator update (#46)

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

Author: fern-api[bot]

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

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

@@ -18,10 +18,10 @@ public class MergeApiClient {
 
     protected final Supplier<AtsClient> atsClient;
 
-    protected final Supplier<FilestorageClient> filestorageClient;
-
     protected final Supplier<CrmClient> crmClient;
 
+    protected final Supplier<FilestorageClient> filestorageClient;
+
     protected final Supplier<HrisClient> hrisClient;
 
     protected final Supplier<TicketingClient> ticketingClient;
@@ -31,8 +31,8 @@ public class MergeApiClient {
     public MergeApiClient(ClientOptions clientOptions) {
         this.clientOptions = clientOptions;
         this.atsClient = Suppliers.memoize(() -> new AtsClient(clientOptions));
-        this.filestorageClient = Suppliers.memoize(() -> new FilestorageClient(clientOptions));
         this.crmClient = Suppliers.memoize(() -> new CrmClient(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));
@@ -42,14 +42,14 @@ public AtsClient ats() {
         return this.atsClient.get();
     }
 
-    public FilestorageClient filestorage() {
-        return this.filestorageClient.get();
-    }
-
     public CrmClient crm() {
         return this.crmClient.get();
     }
 
+    public FilestorageClient filestorage() {
+        return this.filestorageClient.get();
+    }
+
     public HrisClient hris() {
         return this.hrisClient.get();
     }

src/main/java/com/merge/api/core/ApiError.java

@@ -0,0 +1,45 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.merge.api.core;
+
+/**
+ * This exception type will be thrown for any non-2XX API responses.
+ */
+public class MergeApiApiError extends MergeApiError {
+    /**
+     * The error code of the response that triggered the exception.
+     */
+    private final int statusCode;
+
+    /**
+     * The body of the response that triggered the exception.
+     */
+    private final Object body;
+
+    public MergeApiApiError(String message, int statusCode, Object body) {
+        super(message);
+        this.statusCode = statusCode;
+        this.body = body;
+    }
+
+    /**
+     * @return the statusCode
+     */
+    public int statusCode() {
+        return this.statusCode;
+    }
+
+    /**
+     * @return the body
+     */
+    public Object body() {
+        return this.body;
+    }
+
+    @java.lang.Override
+    public String toString() {
+        return "MergeApiApiError{" + "message: " + getMessage() + ", statusCode: " + statusCode + ", body: " + body
+                + "}";
+    }
+}

src/main/java/com/merge/api/core/MergeApiApiError.java

@@ -0,0 +1,17 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.merge.api.core;
+
+/**
+ * This class serves as the base exception for all errors in the SDK.
+ */
+public class MergeApiError extends RuntimeException {
+    public MergeApiError(String message) {
+        super(message);
+    }
+
+    public MergeApiError(String message, Exception e) {
+        super(message, e);
+    }
+}

src/main/java/com/merge/api/core/MergeApiError.java

@@ -52,7 +52,7 @@ public static final class Builder {
 
         private String accountToken = null;
 
-        private Optional<Integer> timeout = null;
+        private Optional<Integer> timeout = Optional.empty();
 
         private TimeUnit timeoutTimeUnit = TimeUnit.SECONDS;
 

src/main/java/com/merge/api/core/RequestOptions.java

@@ -3,8 +3,9 @@
  */
 package com.merge.api.resources.accounting.accountdetails;
 
-import com.merge.api.core.ApiError;
 import com.merge.api.core.ClientOptions;
+import com.merge.api.core.MergeApiApiError;
+import com.merge.api.core.MergeApiError;
 import com.merge.api.core.ObjectMappers;
 import com.merge.api.core.RequestOptions;
 import com.merge.api.resources.accounting.types.AccountDetails;
@@ -44,22 +45,22 @@ public AccountDetails retrieve(RequestOptions requestOptions) {
                 .headers(Headers.of(clientOptions.headers(requestOptions)))
                 .addHeader("Content-Type", "application/json")
                 .build();
-        try {
-            OkHttpClient client = clientOptions.httpClient();
-            if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
-                client = clientOptions.httpClientWithTimeout(requestOptions);
-            }
-            Response response = client.newCall(okhttpRequest).execute();
+        OkHttpClient client = clientOptions.httpClient();
+        if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
+            client = clientOptions.httpClientWithTimeout(requestOptions);
+        }
+        try (Response response = client.newCall(okhttpRequest).execute()) {
             ResponseBody responseBody = response.body();
             if (response.isSuccessful()) {
                 return ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), AccountDetails.class);
             }
-            throw new ApiError(
+            String responseBodyString = responseBody != null ? responseBody.string() : "{}";
+            throw new MergeApiApiError(
+                    "Error with status code " + response.code(),
                     response.code(),
-                    ObjectMappers.JSON_MAPPER.readValue(
-                            responseBody != null ? responseBody.string() : "{}", Object.class));
+                    ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class));
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new MergeApiError("Network error executing HTTP request", e);
         }
     }
 }

src/main/java/com/merge/api/resources/accounting/accountdetails/AccountDetailsClient.java

@@ -3,8 +3,9 @@
  */
 package com.merge.api.resources.accounting.accountingperiods;
 
-import com.merge.api.core.ApiError;
 import com.merge.api.core.ClientOptions;
+import com.merge.api.core.MergeApiApiError;
+import com.merge.api.core.MergeApiError;
 import com.merge.api.core.ObjectMappers;
 import com.merge.api.core.RequestOptions;
 import com.merge.api.resources.accounting.accountingperiods.requests.AccountingPeriodsListRequest;
@@ -68,22 +69,22 @@ public PaginatedAccountingPeriodList list(AccountingPeriodsListRequest request,
                 .headers(Headers.of(clientOptions.headers(requestOptions)))
                 .addHeader("Content-Type", "application/json");
         Request okhttpRequest = _requestBuilder.build();
-        try {
-            OkHttpClient client = clientOptions.httpClient();
-            if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
-                client = clientOptions.httpClientWithTimeout(requestOptions);
-            }
-            Response response = client.newCall(okhttpRequest).execute();
+        OkHttpClient client = clientOptions.httpClient();
+        if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
+            client = clientOptions.httpClientWithTimeout(requestOptions);
+        }
+        try (Response response = client.newCall(okhttpRequest).execute()) {
             ResponseBody responseBody = response.body();
             if (response.isSuccessful()) {
                 return ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), PaginatedAccountingPeriodList.class);
             }
-            throw new ApiError(
+            String responseBodyString = responseBody != null ? responseBody.string() : "{}";
+            throw new MergeApiApiError(
+                    "Error with status code " + response.code(),
                     response.code(),
-                    ObjectMappers.JSON_MAPPER.readValue(
-                            responseBody != null ? responseBody.string() : "{}", Object.class));
+                    ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class));
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new MergeApiError("Network error executing HTTP request", e);
         }
     }
 
@@ -120,22 +121,22 @@ public AccountingPeriod retrieve(
                 .headers(Headers.of(clientOptions.headers(requestOptions)))
                 .addHeader("Content-Type", "application/json");
         Request okhttpRequest = _requestBuilder.build();
-        try {
-            OkHttpClient client = clientOptions.httpClient();
-            if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
-                client = clientOptions.httpClientWithTimeout(requestOptions);
-            }
-            Response response = client.newCall(okhttpRequest).execute();
+        OkHttpClient client = clientOptions.httpClient();
+        if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
+            client = clientOptions.httpClientWithTimeout(requestOptions);
+        }
+        try (Response response = client.newCall(okhttpRequest).execute()) {
             ResponseBody responseBody = response.body();
             if (response.isSuccessful()) {
                 return ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), AccountingPeriod.class);
             }
-            throw new ApiError(
+            String responseBodyString = responseBody != null ? responseBody.string() : "{}";
+            throw new MergeApiApiError(
+                    "Error with status code " + response.code(),
                     response.code(),
-                    ObjectMappers.JSON_MAPPER.readValue(
-                            responseBody != null ? responseBody.string() : "{}", Object.class));
+                    ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class));
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new MergeApiError("Network error executing HTTP request", e);
         }
     }
 }