Sync SDK with updates to Merge API, fix PermissionRequest object typing, RequestOptions added (#35)

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

Author: fern-api[bot]

build.gradle

@@ -46,7 +46,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'dev.merge'
             artifactId = 'merge-java-client'
-            version = '1.0.5'
+            version = '1.0.6'
             from components.java
         }
     }

gradle/wrapper/gradle-wrapper.properties

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

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

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

@@ -9,15 +9,25 @@
 public final class MergeApiClientBuilder {
     private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder();
 
+    private String apiKey = null;
+
+    private String accountToken = null;
+
     private Environment environment = Environment.PRODUCTION;
 
+    /**
+     * Sets apiKey
+     */
     public MergeApiClientBuilder apiKey(String apiKey) {
-        this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + apiKey);
+        this.apiKey = apiKey;
         return this;
     }
 
+    /**
+     * Sets accountToken
+     */
     public MergeApiClientBuilder accountToken(String accountToken) {
-        this.clientOptionsBuilder.addHeader("X-Account-Token", accountToken);
+        this.accountToken = accountToken;
         return this;
     }
 
@@ -32,6 +42,14 @@ public MergeApiClientBuilder url(String url) {
     }
 
     public MergeApiClient build() {
+        if (apiKey == null) {
+            throw new RuntimeException("Please provide apiKey");
+        }
+        this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + this.apiKey);
+        if (accountToken == null) {
+            throw new RuntimeException("Please provide accountToken");
+        }
+        this.clientOptionsBuilder.addHeader("X-Account-Token", this.accountToken);
         clientOptionsBuilder.environment(this.environment);
         return new MergeApiClient(clientOptionsBuilder.build());
     }

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

@@ -21,7 +21,7 @@ public Object body() {
         return this.body;
     }
 
-    @Override
+    @java.lang.Override
     public String toString() {
         return "ApiError{" + "statusCode: " + statusCode + ", body: " + body + "}";
     }

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

@@ -26,7 +26,7 @@ private ClientOptions(
         this.headers = new HashMap<>();
         this.headers.putAll(headers);
         this.headers.putAll(Map.of(
-                "X-Fern-SDK-Name", "com.merge.fern:api-sdk", "X-Fern-SDK-Version", "1.0.5", "X-Fern-Language", "JAVA"));
+                "X-Fern-SDK-Name", "com.merge.fern:api-sdk", "X-Fern-SDK-Version", "1.0.6", "X-Fern-Language", "JAVA"));
         this.headerSuppliers = headerSuppliers;
         this.httpClient = httpClient;
         ;

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

@@ -5,15 +5,31 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 public final class RequestOptions {
     private final String apiKey;
 
     private final String accountToken;
 
-    private RequestOptions(String apiKey, String accountToken) {
+    private final Optional<Integer> timeout;
+
+    private final TimeUnit timeoutTimeUnit;
+
+    private RequestOptions(String apiKey, String accountToken, Optional<Integer> timeout, TimeUnit timeoutTimeUnit) {
         this.apiKey = apiKey;
         this.accountToken = accountToken;
+        this.timeout = timeout;
+        this.timeoutTimeUnit = timeoutTimeUnit;
+    }
+
+    public Optional<Integer> getTimeout() {
+        return timeout;
+    }
+
+    public TimeUnit getTimeoutTimeUnit() {
+        return timeoutTimeUnit;
     }
 
     public Map<String, String> getHeaders() {
@@ -36,6 +52,10 @@ public static final class Builder {
 
         private String accountToken = null;
 
+        private Optional<Integer> timeout = null;
+
+        private TimeUnit timeoutTimeUnit = TimeUnit.SECONDS;
+
         public Builder apiKey(String apiKey) {
             this.apiKey = apiKey;
             return this;
@@ -46,8 +66,19 @@ public Builder accountToken(String accountToken) {
             return this;
         }
 
+        public Builder timeout(Integer timeout) {
+            this.timeout = Optional.of(timeout);
+            return this;
+        }
+
+        public Builder timeout(Integer timeout, TimeUnit timeoutTimeUnit) {
+            this.timeout = Optional.of(timeout);
+            this.timeoutTimeUnit = timeoutTimeUnit;
+            return this;
+        }
+
         public RequestOptions build() {
-            return new RequestOptions(apiKey, accountToken);
+            return new RequestOptions(apiKey, accountToken, timeout, timeoutTimeUnit);
         }
     }
 }

src/main/java/com/merge/api/resources/accounting/AccountingClient.java

@@ -21,6 +21,7 @@
 import com.merge.api.resources.accounting.creditnotes.CreditNotesClient;
 import com.merge.api.resources.accounting.deleteaccount.DeleteAccountClient;
 import com.merge.api.resources.accounting.expenses.ExpensesClient;
+import com.merge.api.resources.accounting.fieldmapping.FieldMappingClient;
 import com.merge.api.resources.accounting.forceresync.ForceResyncClient;
 import com.merge.api.resources.accounting.generatekey.GenerateKeyClient;
 import com.merge.api.resources.accounting.incomestatements.IncomeStatementsClient;
@@ -35,6 +36,7 @@
 import com.merge.api.resources.accounting.phonenumbers.PhoneNumbersClient;
 import com.merge.api.resources.accounting.purchaseorders.PurchaseOrdersClient;
 import com.merge.api.resources.accounting.regeneratekey.RegenerateKeyClient;
+import com.merge.api.resources.accounting.scopes.ScopesClient;
 import com.merge.api.resources.accounting.selectivesync.SelectiveSyncClient;
 import com.merge.api.resources.accounting.syncstatus.SyncStatusClient;
 import com.merge.api.resources.accounting.taxrates.TaxRatesClient;
@@ -75,10 +77,14 @@ public class AccountingClient {
 
     protected final Supplier<CreditNotesClient> creditNotesClient;
 
+    protected final Supplier<ScopesClient> scopesClient;
+
     protected final Supplier<DeleteAccountClient> deleteAccountClient;
 
     protected final Supplier<ExpensesClient> expensesClient;
 
+    protected final Supplier<FieldMappingClient> fieldMappingClient;
+
     protected final Supplier<GenerateKeyClient> generateKeyClient;
 
     protected final Supplier<IncomeStatementsClient> incomeStatementsClient;
@@ -137,8 +143,10 @@ public AccountingClient(ClientOptions clientOptions) {
         this.companyInfoClient = Suppliers.memoize(() -> new CompanyInfoClient(clientOptions));
         this.contactsClient = Suppliers.memoize(() -> new ContactsClient(clientOptions));
         this.creditNotesClient = Suppliers.memoize(() -> new CreditNotesClient(clientOptions));
+        this.scopesClient = Suppliers.memoize(() -> new ScopesClient(clientOptions));
         this.deleteAccountClient = Suppliers.memoize(() -> new DeleteAccountClient(clientOptions));
         this.expensesClient = Suppliers.memoize(() -> new ExpensesClient(clientOptions));
+        this.fieldMappingClient = Suppliers.memoize(() -> new FieldMappingClient(clientOptions));
         this.generateKeyClient = Suppliers.memoize(() -> new GenerateKeyClient(clientOptions));
         this.incomeStatementsClient = Suppliers.memoize(() -> new IncomeStatementsClient(clientOptions));
         this.invoicesClient = Suppliers.memoize(() -> new InvoicesClient(clientOptions));
@@ -218,6 +226,10 @@ public CreditNotesClient creditNotes() {
         return this.creditNotesClient.get();
     }
 
+    public ScopesClient scopes() {
+        return this.scopesClient.get();
+    }
+
     public DeleteAccountClient deleteAccount() {
         return this.deleteAccountClient.get();
     }
@@ -226,6 +238,10 @@ public ExpensesClient expenses() {
         return this.expensesClient.get();
     }
 
+    public FieldMappingClient fieldMapping() {
+        return this.fieldMappingClient.get();
+    }
+
     public GenerateKeyClient generateKey() {
         return this.generateKeyClient.get();
     }

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

@@ -11,6 +11,7 @@
 import java.io.IOException;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
@@ -43,8 +44,13 @@ public AccountDetails retrieve(RequestOptions requestOptions) {
                 .addHeader("Content-Type", "application/json")
                 .build();
         try {
-            Response response =
-                    clientOptions.httpClient().newCall(okhttpRequest).execute();
+            OkHttpClient client = clientOptions.httpClient();
+            if (requestOptions.getTimeout().isPresent()) {
+                client = client.newBuilder()
+                        .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit())
+                        .build();
+            }
+            Response response = client.newCall(okhttpRequest).execute();
             if (response.isSuccessful()) {
                 return ObjectMappers.JSON_MAPPER.readValue(response.body().string(), AccountDetails.class);
             }

src/main/java/com/merge/api/resources/accounting/accountingperiods/AccountingPeriodsClient.java

@@ -14,6 +14,7 @@
 import java.io.IOException;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
@@ -67,8 +68,13 @@ public PaginatedAccountingPeriodList list(AccountingPeriodsListRequest request,
                 .addHeader("Content-Type", "application/json");
         Request okhttpRequest = _requestBuilder.build();
         try {
-            Response response =
-                    clientOptions.httpClient().newCall(okhttpRequest).execute();
+            OkHttpClient client = clientOptions.httpClient();
+            if (requestOptions.getTimeout().isPresent()) {
+                client = client.newBuilder()
+                        .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit())
+                        .build();
+            }
+            Response response = client.newCall(okhttpRequest).execute();
             if (response.isSuccessful()) {
                 return ObjectMappers.JSON_MAPPER.readValue(
                         response.body().string(), PaginatedAccountingPeriodList.class);
@@ -115,8 +121,13 @@ public AccountingPeriod retrieve(
                 .addHeader("Content-Type", "application/json");
         Request okhttpRequest = _requestBuilder.build();
         try {
-            Response response =
-                    clientOptions.httpClient().newCall(okhttpRequest).execute();
+            OkHttpClient client = clientOptions.httpClient();
+            if (requestOptions.getTimeout().isPresent()) {
+                client = client.newBuilder()
+                        .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit())
+                        .build();
+            }
+            Response response = client.newCall(okhttpRequest).execute();
             if (response.isSuccessful()) {
                 return ObjectMappers.JSON_MAPPER.readValue(response.body().string(), AccountingPeriod.class);
             }