Release 24.10 (#112)

ivankamkin · Ivan Kamkin · web-flow · commit 8e93ad70e3cc · 2024-10-25T13:16:52.000+05:00
* Templates and config updated

* Java template fixed

All submodules swithced to main

---------

Co-authored-by: Ivan Kamkin &lt;234-Ivan.Kamkin@users.noreply.git.saltov.dynabic.com&gt;
diff --git a/codegen/Templates/java/ApiClient.mustache b/codegen/Templates/java/ApiClient.mustache
diff --git a/codegen/Templates/java/api.mustache b/codegen/Templates/java/api.mustache
@@ -73,7 +73,7 @@ public class {{classname}} {
     @Deprecated
     {{/isDeprecated}}
     @SuppressWarnings("removal")
-    protected com.squareup.okhttp.Call {{operationId}}Call({{operationIdCamelCase}}Request request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    protected okhttp3.Call {{operationId}}Call({{operationIdCamelCase}}Request request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object {{localVariablePrefix}}postBody = {{#bodyParam}}request.{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
 
         // create path and map variables
@@ -112,10 +112,10 @@ public class {{classname}} {
         {{localVariablePrefix}}headerParams.put("Content-Type", {{localVariablePrefix}}contentType);
 
         if(progressListener != null) {
-            {{localVariablePrefix}}apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
+            {{localVariablePrefix}}apiClient.getHttpClient().networkInterceptors().add(new okhttp3.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
-                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
+                public okhttp3.Response intercept(okhttp3.Interceptor.Chain chain) throws IOException {
+                    okhttp3.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -129,7 +129,7 @@ public class {{classname}} {
     {{#isDeprecated}}
     @Deprecated
     {{/isDeprecated}}
-    private com.squareup.okhttp.Call {{operationId}}ValidateBeforeCall({{operationIdCamelCase}}Request request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private okhttp3.Call {{operationId}}ValidateBeforeCall({{operationIdCamelCase}}Request request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         {{^performBeanValidation}}
         {{#allParams}}{{#required}}
         // verify the required parameter 'request.{{paramName}}' is set
@@ -140,7 +140,7 @@ public class {{classname}} {
         }
         {{/required}}{{/allParams}}
 
-        com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}Call(request, progressListener, progressRequestListener);
+        okhttp3.Call {{localVariablePrefix}}call = {{operationId}}Call(request, progressListener, progressRequestListener);
         return {{localVariablePrefix}}call;
 
         {{/performBeanValidation}}
@@ -155,7 +155,7 @@ public class {{classname}} {
                     parameterValues);
 
             if (violations.size() == 0) {
-                com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}Call(request, progressListener, progressRequestListener);
+                okhttp3.Call {{localVariablePrefix}}call = {{operationId}}Call(request, progressListener, progressRequestListener);
                 return {{localVariablePrefix}}call;
 
             } else {
@@ -212,7 +212,7 @@ public class {{classname}} {
     @Deprecated
     {{/isDeprecated}}
     public ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{operationIdCamelCase}}Request request) throws ApiException {
-        com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}ValidateBeforeCall(request, null, null);
+        okhttp3.Call {{localVariablePrefix}}call = {{operationId}}ValidateBeforeCall(request, null, null);
         {{#returnType}}Type {{localVariablePrefix}}returnType = new TypeToken<{{{returnType}}}>(){}.getType();
         return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call, {{localVariablePrefix}}returnType);{{/returnType}}{{^returnType}}return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call);{{/returnType}}
     }
@@ -235,7 +235,7 @@ public class {{classname}} {
     {{#isDeprecated}}
     @Deprecated
     {{/isDeprecated}}
-    public com.squareup.okhttp.Call {{operationId}}Async({{operationIdCamelCase}}Request request, final ApiCallback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> callback) throws ApiException {
+    public okhttp3.Call {{operationId}}Async({{operationIdCamelCase}}Request request, final ApiCallback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -256,7 +256,7 @@ public class {{classname}} {
             };
         }
 
-        com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}ValidateBeforeCall(request, progressListener, progressRequestListener);
+        okhttp3.Call {{localVariablePrefix}}call = {{operationId}}ValidateBeforeCall(request, progressListener, progressRequestListener);
         {{#returnType}}Type {{localVariablePrefix}}returnType = new TypeToken<{{{returnType}}}>(){}.getType();
         {{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}returnType, callback);{{/returnType}}{{^returnType}}{{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, callback);{{/returnType}}
         return {{localVariablePrefix}}call;
diff --git a/codegen/Templates/java/libraries/okhttp-gson/ProgressRequestBody.mustache b/codegen/Templates/java/libraries/okhttp-gson/ProgressRequestBody.mustache
@@ -2,8 +2,8 @@
 
 package {{invokerPackage}};
 
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.RequestBody;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
 
 import java.io.IOException;
 
diff --git a/codegen/Templates/java/libraries/okhttp-gson/ProgressResponseBody.mustache b/codegen/Templates/java/libraries/okhttp-gson/ProgressResponseBody.mustache
@@ -4,8 +4,8 @@ package {{invokerPackage}};
 
 import java.io.IOException;
 
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.ResponseBody;
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
 
 import okio.Buffer;
 import okio.BufferedSource;
@@ -40,12 +40,12 @@ public class ProgressResponseBody extends ResponseBody {
     }
 
     @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()));
         }
diff --git a/codegen/Templates/java/pom.mustache b/codegen/Templates/java/pom.mustache
@@ -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>
@@ -247,7 +247,7 @@
         {{! Check version compatibility with gson-fire }}
         <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>
         {{#joda}}
             <jodatime-version>2.9.9</jodatime-version>
         {{/joda}}
diff --git a/codegen/config-android.json b/codegen/config-android.json
@@ -4,7 +4,7 @@
     "androidSdkVersion": "33",
     "apiPackage": "com.aspose.barcode.cloud.demo_app",
     "artifactId": "Android Application for Barcode Processing in the Cloud via REST API",
-    "artifactVersion": "24.9.0",
+    "artifactVersion": "24.10.0",
     "groupId": "com.aspose",
     "invokerPackage": "com.aspose.barcode.cloud.demo_app",
     "modelPackage": "com.aspose.barcode.cloud.demo_app.model"
diff --git a/codegen/config-dart.json b/codegen/config-dart.json
@@ -3,6 +3,6 @@
     "browserClient": false,
     "pubDescription": "This SDK allows you to work with Aspose.BarCode for Cloud REST APIs in your Dart or Flutter applications quickly and easily",
     "pubName": "aspose_barcode_cloud",
-    "pubVersion": "1.24.9",
+    "pubVersion": "1.24.10",
     "useEnumExtension": true
 }
diff --git a/codegen/config-go.json b/codegen/config-go.json
@@ -1,4 +1,4 @@
 {
     "packageName": "barcode",
-    "packageVersion": "1.2409.0"
+    "packageVersion": "1.2410.0"
 }
diff --git a/codegen/config-java.json b/codegen/config-java.json
@@ -3,7 +3,7 @@
     "artifactDescription": "Aspose.BarCode Cloud SDK for Java",
     "artifactId": "aspose-barcode-cloud",
     "artifactUrl": "https://www.aspose.cloud",
-    "artifactVersion": "24.9.0",
+    "artifactVersion": "24.10.0",
     "developerEmail": "denis.averin@aspose.com",
     "developerName": "Denis Averin",
     "developerOrganization": "Aspose",
diff --git a/codegen/config-php.json b/codegen/config-php.json
@@ -1,4 +1,4 @@
 {
-    "artifactVersion": "24.9.0",
+    "artifactVersion": "24.10.0",
     "invokerPackage": "Aspose\\BarCode"
 }
diff --git a/codegen/config-python.json b/codegen/config-python.json
@@ -1,6 +1,6 @@
 {
     "packageName": "aspose_barcode_cloud",
     "packageUrl": "https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-python",
-    "packageVersion": "24.9.0",
+    "packageVersion": "24.10.0",
     "projectName": "aspose-barcode-cloud"
 }
diff --git a/codegen/config.json b/codegen/config.json
@@ -1,8 +1,9 @@
 {
     "artifactVersion": "23.7.0",
     "npmName": "aspose-barcode-cloud-node",
-    "npmVersion": "24.9.0",
+    "npmVersion": "24.10.0",
     "packageName": "Aspose.BarCode.Cloud.Sdk",
-    "packageVersion": "24.9.0",
-    "supportsES6": true
+    "packageVersion": "24.10.0",
+    "supportsES6": true,
+    "targetFramework": "netstandard2.0"
 }
diff --git a/submodules/android b/submodules/android
@@ -1 +1 @@
-Subproject commit 76b739aa728d77003031a8a6d823ea86c5d1523a
+Subproject commit 160b1e2710eb4046bd7467acdba00780e3bf4cc7
diff --git a/submodules/dart b/submodules/dart
@@ -1 +1 @@
-Subproject commit a0dfa27fe0cbcbf68382ef442e26ffdcfb2b4816
+Subproject commit 38b46d0116dab5131e33e7865df5944bc998c465
diff --git a/submodules/dotnet b/submodules/dotnet
@@ -1 +1 @@
-Subproject commit c2ea698b342e63567ef308cfb278fba077100275
+Subproject commit b10a83f413ba6b839a10ebf82c62ab74d839605d
diff --git a/submodules/go b/submodules/go
@@ -1 +1 @@
-Subproject commit 19860f2bfd2a1df2b3c1bd0239beb542fcf148e3
+Subproject commit 95ebd38e685461bb09999da3db51a19685946839
diff --git a/submodules/java b/submodules/java
@@ -1 +1 @@
-Subproject commit d181a6f228a0332cae34ae294fd982f1dfbcd50f
+Subproject commit b2cca720e941e04defd35eb34e75bc57959f4be2
diff --git a/submodules/node b/submodules/node
@@ -1 +1 @@
-Subproject commit 6190fd85ae5c1617f64d2009baea8eebe120bc11
+Subproject commit cd51b6b63ea5aa6e8395194473036256f222a261
diff --git a/submodules/php b/submodules/php
@@ -1 +1 @@
-Subproject commit b90eee21425442ad73dbb07eb95a76df782841f1
+Subproject commit 12faecc26925707fa59f0107f87bcae09b246d25
diff --git a/submodules/python b/submodules/python
@@ -1 +1 @@
-Subproject commit 76df3b83ef1dd180a10d708da42197bcea972c5d
+Subproject commit 632cc4ff8178c120e035b360d80711c1b5d8f449

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`"browserClient": false,`
`4`	`4`	`"pubDescription": "This SDK allows you to work with Aspose.BarCode for Cloud REST APIs in your Dart or Flutter applications quickly and easily",`
`5`	`5`	`"pubName": "aspose_barcode_cloud",`
`6`		`- "pubVersion": "1.24.9",`
	`6`	`+ "pubVersion": "1.24.10",`
`7`	`7`	`"useEnumExtension": true`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"packageName": "barcode",`
`3`		`- "packageVersion": "1.2409.0"`
	`3`	`+ "packageVersion": "1.2410.0"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "artifactVersion": "24.9.0",`
	`2`	`+ "artifactVersion": "24.10.0",`
`3`	`3`	`"invokerPackage": "Aspose\\BarCode"`
`4`	`4`	`}`