Merge pull request #9 from avadev/jwenger/issue-fixes

Jwenger/issue fixes

Author: svc-developer

src/main/java/Avalara/SDK/ApiClient.java

@@ -102,17 +102,18 @@ public ApiClient(Configuration config) throws Exception {
         init();
         initHttpClient();
 
+        // TODO: Add back when client creds flow is available through AI.
         // Setup authentications (key: authentication name, value: authentication).
-        if (StringUtils.isNotEmpty(config.getClientId()) && StringUtils.isEmpty(config.getBearerToken())) {
-            OpenIdHelper.populateConfigWithOpenIdDetails(config);
-            RetryingOAuth retryingOAuth = new RetryingOAuth(config.getTokenUrl(), config.getClientId(),
-                    config.getClientSecret(), new ClientCredentialsGrant(), null);
-            authentications.put(
-                    "OAuth",
-                    retryingOAuth
-            );
-            initHttpClient(Collections.<Interceptor>singletonList(retryingOAuth));
-        }
+//        if (StringUtils.isNotEmpty(config.getClientId()) && StringUtils.isEmpty(config.getBearerToken())) {
+//            OpenIdHelper.populateConfigWithOpenIdDetails(config);
+//            RetryingOAuth retryingOAuth = new RetryingOAuth(config.getTokenUrl(), config.getClientId(),
+//                    config.getClientSecret(), new ClientCredentialsGrant(), null);
+//            authentications.put(
+//                    "OAuth",
+//                    retryingOAuth
+//            );
+//            initHttpClient(Collections.<Interceptor>singletonList(retryingOAuth));
+//        }
 
         // Set Authentication type based on Configuration passed into the ApiClient
         if (config.getUsername() != null && config.getPassword() != null) {
@@ -597,6 +598,12 @@ public ApiClient setWriteTimeout(int writeTimeout) {
     }
 
 
+    /**
+     * Format the given parameter object into string.
+     *
+     * @param param Parameter
+     * @return String representation of the parameter
+     */
     /**
      * Format the given parameter object into string.
      *
@@ -606,22 +613,36 @@ public ApiClient setWriteTimeout(int writeTimeout) {
     public String parameterToString(Object param) {
         if (param == null) {
             return "";
-        } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
-            //Serialize to json string and remove the " enclosing characters
+        }
+        // 1) Primitive wrappers and Strings → plain text
+        if (param instanceof String) {
+            return (String) param;
+        }
+        if (param instanceof Number || param instanceof Boolean) {
+            return String.valueOf(param);
+        }
+        if (param instanceof OffsetDateTime odt) {
+            // Convert to LocalDateTime and format as ISO_LOCAL_DATE_TIME
+            return odt
+                    .toLocalDateTime()
+                    .format(DateTimeFormatter.ISO_LOCAL_DATE_TIME);
+        }
+        if (param instanceof Date || param instanceof LocalDate) {
             String jsonStr = json.serialize(param);
+            // e.g. "\"2025-05-06T12:00:00Z\"" → "2025-05-06T12:00:00Z"
             return jsonStr.substring(1, jsonStr.length() - 1);
-        } else if (param instanceof Collection) {
+        }
+        if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
-            for (Object o : (Collection) param) {
-                if (b.length() > 0) {
+            for (Object o : (Collection<?>) param) {
+                if (!b.isEmpty()) {
                     b.append(",");
                 }
-                b.append(String.valueOf(o));
+                b.append(parameterToString(o));
             }
             return b.toString();
-        } else {
-            return String.valueOf(param);
         }
+        return json.serialize(param);
     }
 
     /**
@@ -997,8 +1018,7 @@ public <T> ApiResponse<T> execute(Call call) throws ApiException {
      * @throws Avalara.SDK.ApiException If fail to execute the call
      */
     public <T> ApiResponse<T> execute(Call call, Type returnType) throws ApiException {
-        try {
-            Response response = call.execute();
+        try (Response response = call.execute()) {
             T data = handleResponse(response, returnType);
             return new ApiResponse<T>(response.code(), response.headers().toMultimap(), data);
         } catch (IOException e) {
@@ -1037,16 +1057,14 @@ public void onFailure(Call call, IOException e) {
             @Override
             public void onResponse(Call call, Response response) throws IOException {
                 T result;
-                try {
-                    result = (T) handleResponse(response, returnType);
+                try (Response r = response) {
+                    result = (T) handleResponse(r, returnType);
+                    callback.onSuccess(result, r.code(), r.headers().toMultimap());
                 } catch (ApiException e) {
                     callback.onFailure(e, response.code(), response.headers().toMultimap());
-                    return;
                 } catch (Exception e) {
                     callback.onFailure(new ApiException(e), response.code(), response.headers().toMultimap());
-                    return;
                 }
-                callback.onSuccess(result, response.code(), response.headers().toMultimap());
             }
         });
     }

src/main/java/Avalara/SDK/Configuration.java

@@ -201,19 +201,6 @@ public void setClientId(String clientId) {
         ClientId = clientId;
     }
 
-    /**
-     * Gets or sets the ClientSecret Used for OAuth2 Client Credentials flow.
-     */
-    private String ClientSecret;
-
-    public String getClientSecret() {
-        return ClientSecret;
-    }
-
-    public void setClientSecret(String clientSecret) {
-        ClientSecret = clientSecret;
-    }
-
     /**
      * Gets the Base Path.
      */