Release 24.10 (#80)

* okhttp updated to okhttp3

Author: ivankamkin

.gitignore

@@ -10,5 +10,7 @@
 build
 aspose-barcode-cloud.iml
 !tools/*
+.idea
 
 **/configuration*.json
+

README.md

@@ -5,7 +5,7 @@
 [![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Freleases.aspose.cloud%2Fjava%2Frepo%2Fcom%2Faspose%2Faspose-barcode-cloud%2Fmaven-metadata.xml)](https://releases.aspose.cloud/java/repo/com/aspose/aspose-barcode-cloud/)
 
 - API version: 3.0
-- SDK version: 24.9.0
+- SDK version: 24.10.0
 
 ## Demo applications
 
@@ -68,7 +68,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>com.aspose</groupId>
   <artifactId>aspose-barcode-cloud</artifactId>
-  <version>24.9.0</version>
+  <version>24.10.0</version>
   <scope>compile</scope>
 </dependency>
 ```
@@ -83,7 +83,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-- `target/aspose-barcode-cloud-24.9.0.jar`
+- `target/aspose-barcode-cloud-24.10.0.jar`
 - `target/lib/*.jar`
 
 ## Getting Started

pom.xml

@@ -6,7 +6,7 @@
     <artifactId>aspose-barcode-cloud</artifactId>
     <packaging>jar</packaging>
     <name>aspose-barcode-cloud</name>
-    <version>24.9.0</version>
+    <version>24.10.0</version>
     <url>https://www.aspose.cloud</url>
     <description>Aspose.BarCode Cloud SDK for Java</description>
     <scm>
@@ -160,12 +160,12 @@
             <version>${swagger-core-version}</version>
         </dependency>
         <dependency>
-            <groupId>com.squareup.okhttp</groupId>
+            <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
             <version>${okhttp-version}</version>
         </dependency>
         <dependency>
-            <groupId>com.squareup.okhttp</groupId>
+            <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
             <version>${okhttp-version}</version>
         </dependency>
@@ -199,7 +199,7 @@
         <gson-fire-version>1.9.0</gson-fire-version>
         <gson-version>2.11.0</gson-version>
         <swagger-core-version>1.6.14</swagger-core-version>
-        <okhttp-version>2.7.5</okhttp-version>
+        <okhttp-version>4.12.0</okhttp-version>
         <threetenbp-version>1.6.9</threetenbp-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13.2</junit-version>

src/main/java/com/aspose/barcode/cloud/ApiClient.java

@@ -1,19 +1,19 @@
 package com.aspose.barcode.cloud;
 
 import com.aspose.barcode.cloud.model.ApiErrorResponse;
-import com.squareup.okhttp.Call;
-import com.squareup.okhttp.Callback;
-import com.squareup.okhttp.FormEncodingBuilder;
-import com.squareup.okhttp.Headers;
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.MultipartBuilder;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
-import com.squareup.okhttp.internal.http.HttpMethod;
-import com.squareup.okhttp.logging.HttpLoggingInterceptor;
-import com.squareup.okhttp.logging.HttpLoggingInterceptor.Level;
+
+import okhttp3.Call;
+import okhttp3.FormBody;
+import okhttp3.Headers;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.internal.http.HttpMethod;
+import okhttp3.logging.HttpLoggingInterceptor;
+import okhttp3.logging.HttpLoggingInterceptor.Level;
 
 import okio.BufferedSink;
 import okio.Okio;
@@ -41,7 +41,7 @@
 /** ApiClient. */
 public class ApiClient {
     public final String apiVersion = "v3.0";
-    public final String clientVersion = "24.9.0";
+    public final String clientVersion = "24.10.0";
 
     private String baseUrl = "https://api.aspose.cloud";
     private String tokenUrl = baseUrl + "/connect/token";
@@ -50,7 +50,7 @@ public class ApiClient {
     private boolean debugging = false;
     private final Map<String, String> defaultHeaderMap = new HashMap<>();
     private String tempFolderPath = null;
-    private final OkHttpClient httpClient;
+    private OkHttpClient httpClient;
     private final JSON json;
     private HttpLoggingInterceptor loggingInterceptor;
     private String accessToken;
@@ -79,17 +79,24 @@ public ApiClient(String clientId, String clientSecret, String baseUrl, String to
         }
     }
 
-    protected ApiClient() {
-        httpClient = new OkHttpClient();
+    /** Constructor for ApiClient with readTimeout */
+    protected ApiClient(long readTimeoutMillis) {
+        httpClient =
+                new OkHttpClient.Builder()
+                        .readTimeout(readTimeoutMillis, TimeUnit.MILLISECONDS)
+                        .build();
 
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("Swagger-Codegen/24.9.0/java");
+        setUserAgent("Swagger-Codegen/24.10.0/java");
 
         addDefaultHeader("x-aspose-client", "java sdk");
         addDefaultHeader("x-aspose-client-version", clientVersion);
-        setReadTimeout(60_000);
+    }
+
+    protected ApiClient() {
+        this(60_000);
     }
 
     /**
@@ -197,17 +204,7 @@ public void setTempFolderPath(String tempFolderPath) {
      * @return Timeout in milliseconds
      */
     public int getConnectTimeout() {
-        return httpClient.getConnectTimeout();
-    }
-
-    /**
-     * Sets the connect timeout (in milliseconds). A value of 0 means no timeout, otherwise values
-     * must be between 1 and {@link Integer#MAX_VALUE}.
-     *
-     * @param connectionTimeout connection timeout in milliseconds
-     */
-    public void setConnectTimeout(int connectionTimeout) {
-        httpClient.setConnectTimeout(connectionTimeout, TimeUnit.MILLISECONDS);
+        return httpClient.connectTimeoutMillis();
     }
 
     /**
@@ -216,7 +213,7 @@ public void setConnectTimeout(int connectionTimeout) {
      * @return Timeout in milliseconds
      */
     public int getReadTimeout() {
-        return httpClient.getReadTimeout();
+        return httpClient.readTimeoutMillis();
     }
 
     /**
@@ -226,7 +223,8 @@ public int getReadTimeout() {
      * @param readTimeout read timeout in milliseconds
      */
     public void setReadTimeout(int readTimeout) {
-        httpClient.setReadTimeout(readTimeout, TimeUnit.MILLISECONDS);
+        httpClient =
+                new OkHttpClient.Builder().readTimeout(readTimeout, TimeUnit.MILLISECONDS).build();
     }
 
     /**
@@ -235,17 +233,7 @@ public void setReadTimeout(int readTimeout) {
      * @return Timeout in milliseconds
      */
     public int getWriteTimeout() {
-        return httpClient.getWriteTimeout();
-    }
-
-    /**
-     * Sets the write timeout (in milliseconds). A value of 0 means no timeout, otherwise values
-     * must be between 1 and {@link Integer#MAX_VALUE}.
-     *
-     * @param writeTimeout connection timeout in milliseconds
-     */
-    public void setWriteTimeout(int writeTimeout) {
-        httpClient.setWriteTimeout(writeTimeout, TimeUnit.MILLISECONDS);
+        return httpClient.writeTimeoutMillis();
     }
 
     /**
@@ -265,7 +253,7 @@ public String parameterToString(Object param) {
             return jsonStr.substring(1, jsonStr.length() - 1);
         } else if (param instanceof Collection) {
             StringBuilder b = new StringBuilder();
-            for (Object o : (Collection) param) {
+            for (Object o : (Collection<Object>) param) {
                 if (b.length() > 0) {
                     b.append(",");
                 }
@@ -499,18 +487,18 @@ public <T> T deserialize(Response response, Type returnType) throws ApiException
     public RequestBody serialize(Object obj, String contentType) throws ApiException {
         if (obj instanceof byte[]) {
             // Binary (byte array) body parameter support.
-            return RequestBody.create(MediaType.parse(contentType), (byte[]) obj);
+            return RequestBody.create((byte[]) obj, MediaType.parse(contentType));
         } else if (obj instanceof File) {
             // File body parameter support.
-            return RequestBody.create(MediaType.parse(contentType), (File) obj);
+            return RequestBody.create((File) obj, MediaType.parse(contentType));
         } else if (isJsonMime(contentType)) {
             String content;
             if (obj != null) {
                 content = json.serialize(obj);
             } else {
                 content = null;
             }
-            return RequestBody.create(MediaType.parse(contentType), content);
+            return RequestBody.create(content, MediaType.parse(contentType));
         } else {
             throw new ApiException("Content type \"" + contentType + "\" is not supported");
         }
@@ -630,14 +618,14 @@ public <T> void executeAsync(Call call, ApiCallback<T> callback) {
      */
     public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
         call.enqueue(
-                new Callback() {
+                new okhttp3.Callback() {
                     @Override
-                    public void onFailure(Request request, IOException e) {
+                    public void onFailure(Call call, IOException e) {
                         callback.onFailure(new ApiException(e), 0, null);
                     }
 
                     @Override
-                    public void onResponse(Response response) {
+                    public void onResponse(Call call, Response response) {
                         T result;
                         try {
                             result = handleResponse(response, returnType);
@@ -668,7 +656,7 @@ public <T> T handleResponse(Response response, Type returnType) throws ApiExcept
                 if (response.body() != null) {
                     try {
                         response.body().close();
-                    } catch (IOException e) {
+                    } catch (Exception e) {
                         throw new ApiException(
                                 response.message(),
                                 e,
@@ -683,6 +671,7 @@ public <T> T handleResponse(Response response, Type returnType) throws ApiExcept
         if (response.body() == null) {
             throw new ApiException(response.message(), response.code());
         }
+
         ApiErrorResponse errorResponse;
         try {
             errorResponse = deserialize(response, ApiErrorResponse.class);
@@ -774,7 +763,7 @@ public Request buildRequest(
         if (!HttpMethod.permitsRequestBody(method)) {
             reqBody = null;
         } else if ("application/x-www-form-urlencoded".equals(contentType)) {
-            reqBody = buildRequestBodyFormEncoding(formParams);
+            reqBody = buildRequestBodyForm(formParams);
         } else if ("multipart/form-data".equals(contentType)) {
             reqBody = buildRequestBodyMultipart(formParams);
         } else if (body == null) {
@@ -783,7 +772,7 @@ public Request buildRequest(
                 reqBody = null;
             } else {
                 // use an empty request body (for POST, PUT and PATCH)
-                reqBody = RequestBody.create(MediaType.parse(contentType), "");
+                reqBody = RequestBody.create("", MediaType.parse(contentType));
             }
         } else {
             reqBody = serialize(body, contentType);
@@ -876,8 +865,8 @@ public void processHeaderParams(Map<String, String> headerParams, Request.Builde
      * @param formParams Form parameters in the form of Map
      * @return RequestBody
      */
-    public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams) {
-        FormEncodingBuilder formBuilder = new FormEncodingBuilder();
+    public RequestBody buildRequestBodyForm(Map<String, Object> formParams) {
+        FormBody.Builder formBuilder = new FormBody.Builder();
         for (Entry<String, Object> param : formParams.entrySet()) {
             formBuilder.add(param.getKey(), parameterToString(param.getValue()));
         }
@@ -892,7 +881,7 @@ public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams)
      * @return RequestBody
      */
     public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
-        MultipartBuilder mpBuilder = new MultipartBuilder().type(MultipartBuilder.FORM);
+        MultipartBody.Builder mpBuilder = new MultipartBody.Builder().setType(MultipartBody.FORM);
         for (Entry<String, Object> param : formParams.entrySet()) {
             Object paramValue = param.getValue();
             if (paramValue instanceof File) {
@@ -906,7 +895,7 @@ public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
                                         + file.getName()
                                         + "\"");
                 MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
-                mpBuilder.addPart(partHeaders, RequestBody.create(mediaType, file));
+                mpBuilder.addPart(partHeaders, RequestBody.create(file, mediaType));
             } else if (paramValue instanceof Collection) {
                 Collection<Object> collection = (Collection<Object>) paramValue;
                 for (Object item : collection) {
@@ -915,15 +904,15 @@ public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
                                     "Content-Disposition",
                                     "form-data; name=\"" + param.getKey() + "\"");
                     mpBuilder.addPart(
-                            partHeaders, RequestBody.create(null, parameterToString(item)));
+                            partHeaders, RequestBody.create(parameterToString(item), null));
                 }
             } else {
                 Headers partHeaders =
                         Headers.of(
                                 "Content-Disposition",
                                 "form-data; name=\"" + param.getKey() + "\"");
                 mpBuilder.addPart(
-                        partHeaders, RequestBody.create(null, parameterToString(paramValue)));
+                        partHeaders, RequestBody.create(parameterToString(paramValue), null));
             }
         }
         return mpBuilder.build();
@@ -952,7 +941,7 @@ public String guessContentTypeFromFile(File file) {
     public void requestToken() throws ApiException {
         try {
             RequestBody requestBody =
-                    new FormEncodingBuilder()
+                    new FormBody.Builder()
                             .addEncoded("grant_type", "client_credentials")
                             .addEncoded("client_id", clientId)
                             .addEncoded("client_secret", clientSecret)

src/main/java/com/aspose/barcode/cloud/ProgressRequestBody.java

@@ -25,8 +25,8 @@
 
 package com.aspose.barcode.cloud;
 
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.RequestBody;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
 
 import okio.Buffer;
 import okio.BufferedSink;

src/main/java/com/aspose/barcode/cloud/ProgressResponseBody.java

@@ -25,8 +25,8 @@
 
 package com.aspose.barcode.cloud;
 
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.ResponseBody;
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
 
 import okio.Buffer;
 import okio.BufferedSource;
@@ -59,12 +59,12 @@ public MediaType contentType() {
     }
 
     @Override
-    public long contentLength() throws IOException {
+    public long contentLength() {
         return responseBody.contentLength();
     }
 
     @Override
-    public BufferedSource source() throws IOException {
+    public BufferedSource source() {
         if (bufferedSource == null) {
             bufferedSource = Okio.buffer(source(responseBody.source()));
         }