Skip to content

Commit e2b4fa0

Browse files
HugoMarioHugoMario
committed
Revert "updated okhttp-gson library version"
This reverts commit 2ed5d30.
1 parent 8707056 commit e2b4fa0

File tree

8 files changed

+88
-169
lines changed

8 files changed

+88
-169
lines changed

‎src/main/resources/handlebars/Java/libraries/okhttp-gson/ApiClient.mustache

Lines changed: 62 additions & 138 deletions
Large diffs are not rendered by default.

‎src/main/resources/handlebars/Java/libraries/okhttp-gson/GzipRequestInterceptor.mustache

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,13 @@
22

33
package {{invokerPackage}};
44

5-
import java.io.IOException;
5+
import com.squareup.okhttp.*;
66
import okio.Buffer;
77
import okio.BufferedSink;
88
import okio.GzipSink;
99
import okio.Okio;
10-
import okhttp3.Interceptor;
11-
import okhttp3.MediaType;
12-
import okhttp3.Request;
13-
import okhttp3.RequestBody;
14-
import okhttp3.Response;
1510

11+
import java.io.IOException;
1612

1713
/**
1814
* Encodes request bodies using gzip.

‎src/main/resources/handlebars/Java/libraries/okhttp-gson/JSON.mustache

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public class JSON {
6161
public static GsonBuilder createGson() {
6262
GsonFireBuilder fireBuilder = new GsonFireBuilder()
6363
{{#parent}}
64-
{{#discriminator}}
6564
.registerTypeSelector({{classname}}.class, new TypeSelector<{{classname}}>() {
6665
@Override
6766
public Class<? extends {{classname}}> getClassForElement(JsonElement readElement) {
@@ -109,7 +108,6 @@ public class JSON {
109108
}
110109
}
111110
})
112-
{{/discriminator}}
113111
{{/parent}}
114112
;
115113
return fireBuilder.createGsonBuilder();

‎src/main/resources/handlebars/Java/libraries/okhttp-gson/ProgressRequestBody.mustache

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22

33
package {{invokerPackage}};
44

5+
import com.squareup.okhttp.MediaType;
6+
import com.squareup.okhttp.RequestBody;
7+
58
import java.io.IOException;
69

710
import okio.Buffer;
811
import okio.BufferedSink;
912
import okio.ForwardingSink;
1013
import okio.Okio;
1114
import okio.Sink;
12-
import okhttp3.MediaType;
13-
import okhttp3.RequestBody;
1415

1516
public class ProgressRequestBody extends RequestBody {
1617

‎src/main/resources/handlebars/Java/libraries/okhttp-gson/ProgressResponseBody.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
package {{invokerPackage}};
44

5+
import com.squareup.okhttp.MediaType;
6+
import com.squareup.okhttp.ResponseBody;
7+
58
import java.io.IOException;
69

710
import okio.Buffer;
@@ -10,9 +13,6 @@ import okio.ForwardingSource;
1013
import okio.Okio;
1114
import okio.Source;
1215

13-
import okhttp3.MediaType;
14-
import okhttp3.ResponseBody;
15-
1616
public class ProgressResponseBody extends ResponseBody {
1717
1818
public interface ProgressListener {
@@ -34,12 +34,12 @@ public class ProgressResponseBody extends ResponseBody {
3434
}
3535

3636
@Override
37-
public long contentLength() {
37+
public long contentLength() throws IOException {
3838
return responseBody.contentLength();
3939
}
4040

4141
@Override
42-
public BufferedSource source() {
42+
public BufferedSource source() throws IOException {
4343
if (bufferedSource == null) {
4444
bufferedSource = Okio.buffer(source(responseBody.source()));
4545
}

‎src/main/resources/handlebars/Java/libraries/okhttp-gson/api.mustache

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public class {{classname}} {
7676
* @see <a href="{{url}}">{{summary}} Documentation</a>
7777
{{/externalDocs}}
7878
*/
79-
public okhttp3.Call {{operationId}}Call({{#parameters}}{{{dataType}}} {{paramName}}, {{/parameters}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
79+
public com.squareup.okhttp.Call {{operationId}}Call({{#parameters}}{{{dataType}}} {{paramName}}, {{/parameters}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
8080
Object {{localVariablePrefix}}localVarPostBody = {{^isForm}}{{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}{{/isForm}}{{#isForm}}null{{/isForm}};
8181

8282
// create path and map variables
@@ -113,10 +113,10 @@ public class {{classname}} {
113113
{{localVariablePrefix}}localVarHeaderParams.put("Content-Type", {{localVariablePrefix}}localVarContentType);
114114

115115
if(progressListener != null) {
116-
apiClient.getHttpClient().networkInterceptors().add(new okhttp3.Interceptor() {
116+
apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
117117
@Override
118-
public okhttp3.Response intercept(okhttp3.Interceptor.Chain chain) throws IOException {
119-
okhttp3.Response originalResponse = chain.proceed(chain.request());
118+
public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
119+
com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
120120
return originalResponse.newBuilder()
121121
.body(new ProgressResponseBody(originalResponse.body(), progressListener))
122122
.build();
@@ -129,7 +129,7 @@ public class {{classname}} {
129129
}
130130

131131
@SuppressWarnings("rawtypes")
132-
private okhttp3.Call {{operationId}}ValidateBeforeCall({{#parameters}}{{{dataType}}} {{paramName}}, {{/parameters}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
132+
private com.squareup.okhttp.Call {{operationId}}ValidateBeforeCall({{#parameters}}{{{dataType}}} {{paramName}}, {{/parameters}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
133133
{{^performBeanValidation}}
134134
{{#parameters}}{{#required}}
135135
// verify the required parameter '{{paramName}}' is set
@@ -138,7 +138,7 @@ public class {{classname}} {
138138
}
139139
{{/required}}{{/parameters}}
140140

141-
okhttp3.Call {{localVariablePrefix}}call = {{operationId}}Call({{#parameters}}{{paramName}}, {{/parameters}}progressListener, progressRequestListener);
141+
com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}Call({{#parameters}}{{paramName}}, {{/parameters}}progressListener, progressRequestListener);
142142
return {{localVariablePrefix}}call;
143143

144144
{{/performBeanValidation}}
@@ -153,7 +153,7 @@ public class {{classname}} {
153153
parameterValues);
154154

155155
if (violations.size() == 0) {
156-
okhttp3.Call {{localVariablePrefix}}call = {{operationId}}Call({{#parameters}}{{paramName}}, {{/parameters}}progressListener, progressRequestListener);
156+
com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}Call({{#parameters}}{{paramName}}, {{/parameters}}progressListener, progressRequestListener);
157157
return {{localVariablePrefix}}call;
158158

159159
} else {
@@ -202,7 +202,7 @@ public class {{classname}} {
202202
{{/externalDocs}}
203203
*/
204204
public ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#parameters}}{{#if useBeanValidation}}{{>beanValidationQueryParams}}{{/if}}{{{dataType}}} {{paramName}}{{#has this 'more'}}, {{/has}}{{/parameters}}) throws ApiException {
205-
okhttp3.Call {{localVariablePrefix}}call = {{operationId}}ValidateBeforeCall({{#parameters}}{{paramName}}, {{/parameters}}null, null);
205+
com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}ValidateBeforeCall({{#parameters}}{{paramName}}, {{/parameters}}null, null);
206206
{{#returnType}}Type {{localVariablePrefix}}localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
207207
return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call, {{localVariablePrefix}}localVarReturnType);{{/returnType}}{{^returnType}}return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call);{{/returnType}}
208208
}
@@ -219,7 +219,7 @@ public class {{classname}} {
219219
* @see <a href="{{url}}">{{summary}} Documentation</a>
220220
{{/externalDocs}}
221221
*/
222-
public okhttp3.Call {{operationId}}Async({{#parameters}}{{{dataType}}} {{paramName}}, {{/parameters}}final ApiCallback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{localVariablePrefix}}callback) throws ApiException {
222+
public com.squareup.okhttp.Call {{operationId}}Async({{#parameters}}{{{dataType}}} {{paramName}}, {{/parameters}}final ApiCallback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{localVariablePrefix}}callback) throws ApiException {
223223
224224
ProgressResponseBody.ProgressListener progressListener = null;
225225
ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -240,7 +240,7 @@ public class {{classname}} {
240240
};
241241
}
242242

243-
okhttp3.Call {{localVariablePrefix}}call = {{operationId}}ValidateBeforeCall({{#parameters}}{{paramName}}, {{/parameters}}progressListener, progressRequestListener);
243+
com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}ValidateBeforeCall({{#parameters}}{{paramName}}, {{/parameters}}progressListener, progressRequestListener);
244244
{{#returnType}}Type {{localVariablePrefix}}localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
245245
{{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}localVarReturnType, {{localVariablePrefix}}callback);{{/returnType}}{{^returnType}}{{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}callback);{{/returnType}}
246246
return {{localVariablePrefix}}call;

‎src/main/resources/handlebars/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package {{invokerPackage}}.auth;
44

55
import {{invokerPackage}}.Pair;
66

7-
import okhttp3.Credentials;
7+
import com.squareup.okhttp.Credentials;
88

99
import java.util.Map;
1010
import java.util.List;

‎src/main/resources/handlebars/Java/libraries/okhttp-gson/pom.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,12 @@
207207
</dependency>
208208
{{/notNullJacksonAnnotation}}
209209
<dependency>
210-
<groupId>com.squareup.okhttp3</groupId>
210+
<groupId>com.squareup.okhttp</groupId>
211211
<artifactId>okhttp</artifactId>
212212
<version>${okhttp-version}</version>
213213
</dependency>
214214
<dependency>
215-
<groupId>com.squareup.okhttp3</groupId>
215+
<groupId>com.squareup.okhttp</groupId>
216216
<artifactId>logging-interceptor</artifactId>
217217
<version>${okhttp-version}</version>
218218
</dependency>
@@ -309,9 +309,9 @@
309309
{{^useOas2}}
310310
<swagger-core-version>2.0.0</swagger-core-version>
311311
{{/useOas2}}
312-
<okhttp-version>4.1.0</okhttp-version>
313-
<gson-version>2.9.1</gson-version>
314-
<gson-fire-version>1.8.5</gson-fire-version>
312+
<okhttp-version>2.7.5</okhttp-version>
313+
<gson-version>2.8.1</gson-version>
314+
<gson-fire-version>1.8.3</gson-fire-version>
315315
{{#supportJava6}}
316316
<commons_io_version>2.5</commons_io_version>
317317
<commons_lang3_version>3.6</commons_lang3_version>

0 commit comments

Comments
 (0)