Skip to content

Commit cf51d60

Browse files
Fyro-IngFyro-Ing
authored
Merge branch 'swagger-api:master' into issues/1054
2 parents 4f14f23 + 74daed5 commit cf51d60

File tree

8 files changed

+169
-88
lines changed

8 files changed

+169
-88
lines changed

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

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

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

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

33
package {{invokerPackage}};
44

5-
import com.squareup.okhttp.*;
5+
import java.io.IOException;
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;
1015

11-
import java.io.IOException;
1216

1317
/**
1418
* Encodes request bodies using gzip.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public class JSON {
6161
public static GsonBuilder createGson() {
6262
GsonFireBuilder fireBuilder = new GsonFireBuilder()
6363
{{#parent}}
64+
{{#discriminator}}
6465
.registerTypeSelector({{classname}}.class, new TypeSelector<{{classname}}>() {
6566
@Override
6667
public Class<? extends {{classname}}> getClassForElement(JsonElement readElement) {
@@ -108,6 +109,7 @@ public class JSON {
108109
}
109110
}
110111
})
112+
{{/discriminator}}
111113
{{/parent}}
112114
;
113115
return fireBuilder.createGsonBuilder();

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

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

33
package {{invokerPackage}};
44

5-
import com.squareup.okhttp.MediaType;
6-
import com.squareup.okhttp.RequestBody;
7-
85
import java.io.IOException;
96

107
import okio.Buffer;
118
import okio.BufferedSink;
129
import okio.ForwardingSink;
1310
import okio.Okio;
1411
import okio.Sink;
12+
import okhttp3.MediaType;
13+
import okhttp3.RequestBody;
1514

1615
public class ProgressRequestBody extends RequestBody {
1716

‎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,9 +2,6 @@
22

33
package {{invokerPackage}};
44

5-
import com.squareup.okhttp.MediaType;
6-
import com.squareup.okhttp.ResponseBody;
7-
85
import java.io.IOException;
96

107
import okio.Buffer;
@@ -13,6 +10,9 @@ import okio.ForwardingSource;
1310
import okio.Okio;
1411
import okio.Source;
1512

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() throws IOException {
37+
public long contentLength() {
3838
return responseBody.contentLength();
3939
}
4040

4141
@Override
42-
public BufferedSource source() throws IOException {
42+
public BufferedSource source() {
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
@@ -89,7 +89,7 @@ public class {{classname}} {
8989
* @see <a href="{{url}}">{{summary}} Documentation</a>
9090
{{/externalDocs}}
9191
*/
92-
public com.squareup.okhttp.Call {{operationId}}Call({{#parameters}}{{{dataType}}} {{paramName}}, {{/parameters}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
92+
public okhttp3.Call {{operationId}}Call({{#parameters}}{{{dataType}}} {{paramName}}, {{/parameters}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
9393
Object {{localVariablePrefix}}localVarPostBody = {{^isForm}}{{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}{{/isForm}}{{#isForm}}null{{/isForm}};
9494

9595
// create path and map variables
@@ -126,10 +126,10 @@ public class {{classname}} {
126126
{{localVariablePrefix}}localVarHeaderParams.put("Content-Type", {{localVariablePrefix}}localVarContentType);
127127

128128
if(progressListener != null) {
129-
apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
129+
apiClient.getHttpClient().networkInterceptors().add(new okhttp3.Interceptor() {
130130
@Override
131-
public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
132-
com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
131+
public okhttp3.Response intercept(okhttp3.Interceptor.Chain chain) throws IOException {
132+
okhttp3.Response originalResponse = chain.proceed(chain.request());
133133
return originalResponse.newBuilder()
134134
.body(new ProgressResponseBody(originalResponse.body(), progressListener))
135135
.build();
@@ -142,7 +142,7 @@ public class {{classname}} {
142142
}
143143

144144
@SuppressWarnings("rawtypes")
145-
private com.squareup.okhttp.Call {{operationId}}ValidateBeforeCall({{#parameters}}{{{dataType}}} {{paramName}}, {{/parameters}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
145+
private okhttp3.Call {{operationId}}ValidateBeforeCall({{#parameters}}{{{dataType}}} {{paramName}}, {{/parameters}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
146146
{{^performBeanValidation}}
147147
{{#parameters}}{{#required}}
148148
// verify the required parameter '{{paramName}}' is set
@@ -151,7 +151,7 @@ public class {{classname}} {
151151
}
152152
{{/required}}{{/parameters}}
153153

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

157157
{{/performBeanValidation}}
@@ -166,7 +166,7 @@ public class {{classname}} {
166166
parameterValues);
167167

168168
if (violations.size() == 0) {
169-
com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}Call({{#parameters}}{{paramName}}, {{/parameters}}progressListener, progressRequestListener);
169+
okhttp3.Call {{localVariablePrefix}}call = {{operationId}}Call({{#parameters}}{{paramName}}, {{/parameters}}progressListener, progressRequestListener);
170170
return {{localVariablePrefix}}call;
171171

172172
} else {
@@ -215,7 +215,7 @@ public class {{classname}} {
215215
{{/externalDocs}}
216216
*/
217217
public ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#parameters}}{{#if useBeanValidation}}{{>beanValidationQueryParams}}{{/if}}{{{dataType}}} {{paramName}}{{#has this 'more'}}, {{/has}}{{/parameters}}) throws ApiException {
218-
com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}ValidateBeforeCall({{#parameters}}{{paramName}}, {{/parameters}}null, null);
218+
okhttp3.Call {{localVariablePrefix}}call = {{operationId}}ValidateBeforeCall({{#parameters}}{{paramName}}, {{/parameters}}null, null);
219219
{{#returnType}}Type {{localVariablePrefix}}localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
220220
return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call, {{localVariablePrefix}}localVarReturnType);{{/returnType}}{{^returnType}}return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call);{{/returnType}}
221221
}
@@ -232,7 +232,7 @@ public class {{classname}} {
232232
* @see <a href="{{url}}">{{summary}} Documentation</a>
233233
{{/externalDocs}}
234234
*/
235-
public com.squareup.okhttp.Call {{operationId}}Async({{#parameters}}{{{dataType}}} {{paramName}}, {{/parameters}}final ApiCallback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{localVariablePrefix}}callback) throws ApiException {
235+
public okhttp3.Call {{operationId}}Async({{#parameters}}{{{dataType}}} {{paramName}}, {{/parameters}}final ApiCallback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{localVariablePrefix}}callback) throws ApiException {
236236
237237
ProgressResponseBody.ProgressListener progressListener = null;
238238
ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -253,7 +253,7 @@ public class {{classname}} {
253253
};
254254
}
255255

256-
com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}ValidateBeforeCall({{#parameters}}{{paramName}}, {{/parameters}}progressListener, progressRequestListener);
256+
okhttp3.Call {{localVariablePrefix}}call = {{operationId}}ValidateBeforeCall({{#parameters}}{{paramName}}, {{/parameters}}progressListener, progressRequestListener);
257257
{{#returnType}}Type {{localVariablePrefix}}localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
258258
{{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}localVarReturnType, {{localVariablePrefix}}callback);{{/returnType}}{{^returnType}}{{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}callback);{{/returnType}}
259259
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 com.squareup.okhttp.Credentials;
7+
import okhttp3.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.okhttp</groupId>
210+
<groupId>com.squareup.okhttp3</groupId>
211211
<artifactId>okhttp</artifactId>
212212
<version>${okhttp-version}</version>
213213
</dependency>
214214
<dependency>
215-
<groupId>com.squareup.okhttp</groupId>
215+
<groupId>com.squareup.okhttp3</groupId>
216216
<artifactId>logging-interceptor</artifactId>
217217
<version>${okhttp-version}</version>
218218
</dependency>
@@ -318,9 +318,9 @@
318318
{{^useOas2}}
319319
<swagger-core-version>2.0.0</swagger-core-version>
320320
{{/useOas2}}
321-
<okhttp-version>2.7.5</okhttp-version>
322-
<gson-version>2.8.1</gson-version>
323-
<gson-fire-version>1.8.3</gson-fire-version>
321+
<okhttp-version>4.1.0</okhttp-version>
322+
<gson-version>2.9.1</gson-version>
323+
<gson-fire-version>1.8.5</gson-fire-version>
324324
{{#supportJava6}}
325325
<commons_io_version>2.5</commons_io_version>
326326
<commons_lang3_version>3.6</commons_lang3_version>

0 commit comments

Comments
 (0)