Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
313 changes: 167 additions & 146 deletions codegen/Templates/java/ApiClient.mustache

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions codegen/Templates/java/api.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand All @@ -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
Expand All @@ -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}}
Expand All @@ -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 {
Expand Down Expand Up @@ -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}}
}
Expand All @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()));
}
Expand Down
6 changes: 3 additions & 3 deletions codegen/Templates/java/pom.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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}}
Expand Down
2 changes: 1 addition & 1 deletion codegen/config-android.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion codegen/config-dart.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion codegen/config-go.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"packageName": "barcode",
"packageVersion": "1.2409.0"
"packageVersion": "1.2410.0"
}
2 changes: 1 addition & 1 deletion codegen/config-java.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]",
"developerName": "Denis Averin",
"developerOrganization": "Aspose",
Expand Down
2 changes: 1 addition & 1 deletion codegen/config-php.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"artifactVersion": "24.9.0",
"artifactVersion": "24.10.0",
"invokerPackage": "Aspose\\BarCode"
}
2 changes: 1 addition & 1 deletion codegen/config-python.json
Original file line number Diff line number Diff line change
@@ -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"
}
7 changes: 4 additions & 3 deletions codegen/config.json
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 1 addition & 1 deletion submodules/dart
2 changes: 1 addition & 1 deletion submodules/go
2 changes: 1 addition & 1 deletion submodules/node
2 changes: 1 addition & 1 deletion submodules/php