Skip to content

Commit e73110a

Browse files
Update openapi generator version to v7.10.0 (was v7.9.0) (#154)
1 parent 5ebe401 commit e73110a

File tree

14 files changed

+271
-114
lines changed

14 files changed

+271
-114
lines changed

.github/workflows/update-specs-and-client-libraries.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
python_version: ${{ steps.generator.outputs.python_urllib3_version }}
7777
ruby_version: ${{ steps.generator.outputs.ruby_faraday_version }}
7878
container:
79-
image: openapitools/openapi-generator-cli:v7.9.0
79+
image: openapitools/openapi-generator-cli:v7.10.0
8080
env:
8181
OPENAPI_GENERATOR_COMMAND: docker-entrypoint.sh
8282
BUMP_CLIENT_LIBRARY_VERSION: ${{ inputs.type-of-change }}
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
16502193337397367078434a27f67edfc6410f4c06d12db876155885d6a49394 ./README.mustache
3-
9866a9e83531d72f155a0fdea252cfe5d340deea3d6e2da7eb64c941dc88577a ./libraries/okhttp-gson/ApiClient.mustache
4-
7db4829dd39d1e769cfe38a07e976684f71e5db4077030ea1b423703958da223 ./libraries/okhttp-gson/api.mustache
5-
0e77feaf2d6b0818194161ac7e621189aa6e7900b45d46fa4ff1232894bb1a7a ./libraries/okhttp-gson/oneof_model.mustache
6-
f20b6129f3b473ecaa4e39f760bb1028d6c1f832928fa2f460131e2c54d66ed0 ./libraries/okhttp-gson/pojo.mustache
7-
2f63581598dd2ba1373a51c0c3dfbcfa2a43d25f278a048c04c6679ef03f1224 ./libraries/okhttp-gson/pom.mustache
3+
a82c17a026cf8055c3bcfe41b940b165b5fc7126c58283c4c557d8b9ec668950 ./libraries/okhttp-gson/ApiClient.mustache
4+
a1de601140f7e476752a87ae96902d45b499c8f8383eced56c6322e61549bdac ./libraries/okhttp-gson/api.mustache
5+
245137cb0e10389bbe3b2c3061f3c3baa95ae35575b5b2576e0042a3942b742a ./libraries/okhttp-gson/oneof_model.mustache
6+
2c2d109d7248ff40bc3309afd1b0aed95c0c0fac12814fe3354075b6f2649322 ./libraries/okhttp-gson/pojo.mustache
7+
a3b6ce241edbd6e22b84f54f4c07c59454bc7be4ede93b33c5f034125f97ead6 ./libraries/okhttp-gson/pom.mustache

generators/java/okhttp-gson/templates/libraries/okhttp-gson/ApiClient.mustache

+2-2
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ public class ApiClient {
999999
}
10001000
{{/dynamicOperations}}
10011001
1002-
/**
1002+
/**
10031003
* Formats the specified free-form query parameters to a list of {@code Pair} objects.
10041004
*
10051005
* @param value The free-form query parameters.
@@ -1013,7 +1013,7 @@ public class ApiClient {
10131013
return params;
10141014
}
10151015
1016-
@SuppressWarnings("unchecked"){{! Fix unchecked cast warning }}
1016+
@SuppressWarnings("unchecked")
10171017
final Map<String, Object> valuesMap = (Map<String, Object>) value;
10181018
10191019
for (Map.Entry<String, Object> entry : valuesMap.entrySet()) {

generators/java/okhttp-gson/templates/libraries/okhttp-gson/api.mustache

+27-15
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ public class {{classname}} {
9999
* @throws ApiException If fail to serialize the request body object
100100
{{#responses.0}}
101101
* @http.response.details
102-
<table summary="Response Details" border="1">
102+
<table border="1">
103+
<caption>Response Details</caption>
103104
<tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
104105
{{#responses}}
105106
<tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>
@@ -181,12 +182,6 @@ public class {{classname}} {
181182

182183
{{/isQueryParam}}
183184
{{/constantParams}}
184-
{{#headerParams}}
185-
if ({{paramName}} != null) {
186-
localVarHeaderParams.put("{{baseName}}", localVarApiClient.parameterToString({{paramName}}));
187-
}
188-
189-
{{/headerParams}}
190185
{{#constantParams}}
191186
{{#isHeaderParam}}
192187
// Set client side default value of Header Param "{{baseName}}".
@@ -231,6 +226,15 @@ public class {{classname}} {
231226
if (localVarContentType != null) {
232227
localVarHeaderParams.put("Content-Type", localVarContentType);
233228
}
229+
{{^dynamicOperations}}
230+
{{#headerParams}}
231+
232+
if ({{paramName}} != null) {
233+
localVarHeaderParams.put("{{baseName}}", localVarApiClient.parameterToString({{paramName}}));
234+
}
235+
236+
{{/headerParams}}
237+
{{/dynamicOperations}}
234238

235239
String[] localVarAuthNames = new String[] { {{#withAWSV4Signature}}"AWS4Auth"{{/withAWSV4Signature}}{{#authMethods}}{{#-first}}{{#withAWSV4Signature}}, {{/withAWSV4Signature}}{{/-first}}"{{name}}"{{^-last}}, {{/-last}}{{/authMethods}} };
236240
return localVarApiClient.buildCall(basePath, localVarPath, {{^dynamicOperations}}"{{httpMethod}}"{{/dynamicOperations}}{{#dynamicOperations}}apiOperation.getMethod(){{/dynamicOperations}}, localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
@@ -288,7 +292,8 @@ public class {{classname}} {
288292
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
289293
{{#responses.0}}
290294
* @http.response.details
291-
<table summary="Response Details" border="1">
295+
<table border="1">
296+
<caption>Response Details</caption>
292297
<tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
293298
{{#responses}}
294299
<tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>
@@ -328,7 +333,8 @@ public class {{classname}} {
328333
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
329334
{{#responses.0}}
330335
* @http.response.details
331-
<table summary="Response Details" border="1">
336+
<table border="1">
337+
<caption>Response Details</caption>
332338
<tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
333339
{{#responses}}
334340
<tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>
@@ -396,7 +402,8 @@ public class {{classname}} {
396402
* @throws ApiException If fail to process the API call, e.g. serializing the request body object
397403
{{#responses.0}}
398404
* @http.response.details
399-
<table summary="Response Details" border="1">
405+
<table border="1">
406+
<caption>Response Details</caption>
400407
<tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
401408
{{#responses}}
402409
<tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>
@@ -456,7 +463,8 @@ public class {{classname}} {
456463
* @throws ApiException If fail to serialize the request body object
457464
{{#responses.0}}
458465
* @http.response.details
459-
<table summary="Response Details" border="1">
466+
<table border="1">
467+
<caption>Response Details</caption>
460468
<tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
461469
{{#responses}}
462470
<tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>
@@ -480,7 +488,8 @@ public class {{classname}} {
480488
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
481489
{{#responses.0}}
482490
* @http.response.details
483-
<table summary="Response Details" border="1">
491+
<table border="1">
492+
<caption>Response Details</caption>
484493
<tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
485494
{{#responses}}
486495
<tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>
@@ -512,7 +521,8 @@ public class {{classname}} {
512521
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
513522
{{#responses.0}}
514523
* @http.response.details
515-
<table summary="Response Details" border="1">
524+
<table border="1">
525+
<caption>Response Details</caption>
516526
<tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
517527
{{#responses}}
518528
<tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>
@@ -544,7 +554,8 @@ public class {{classname}} {
544554
* @throws ApiException If fail to process the API call, e.g. serializing the request body object
545555
{{#responses.0}}
546556
* @http.response.details
547-
<table summary="Response Details" border="1">
557+
<table border="1">
558+
<caption>Response Details</caption>
548559
<tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
549560
{{#responses}}
550561
<tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>
@@ -570,7 +581,8 @@ public class {{classname}} {
570581
* @return API{{operationId}}Request
571582
{{#responses.0}}
572583
* @http.response.details
573-
<table summary="Response Details" border="1">
584+
<table border="1">
585+
<caption>Response Details</caption>
574586
<tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
575587
{{#responses}}
576588
<tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>

generators/java/okhttp-gson/templates/libraries/okhttp-gson/oneof_model.mustache

+3-3
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
378378

379379
{{#composedSchemas}}
380380
{{#oneOf}}
381-
{{^vendorExtensions.x-duplicated-data-type}}
381+
{{^vendorExtensions.x-duplicated-data-type-ignoring-erasure}}
382382
/**
383383
* Get the actual instance of `{{{dataType}}}`. If the actual instance is not `{{{dataType}}}`,
384384
* the ClassCastException will be thrown.
@@ -391,10 +391,10 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
391391
public {{{dataType}}} get{{#sanitizeGeneric}}{{{dataType}}}{{/sanitizeGeneric}}() throws ClassCastException {
392392
return ({{{dataType}}})super.getActualInstance();
393393
}
394-
{{/vendorExtensions.x-duplicated-data-type}}
394+
395+
{{/vendorExtensions.x-duplicated-data-type-ignoring-erasure}}
395396
{{/oneOf}}
396397
{{/composedSchemas}}
397-
398398
/**
399399
* Validates the JSON Element and throws an exception if issues found
400400
*

generators/java/okhttp-gson/templates/libraries/okhttp-gson/pojo.mustache

+4-13
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
7070
{{#vendorExtensions.x-field-extra-annotation}}
7171
{{{vendorExtensions.x-field-extra-annotation}}}
7272
{{/vendorExtensions.x-field-extra-annotation}}
73+
{{>nullable_var_annotations}}
7374
{{#isDiscriminator}}protected{{/isDiscriminator}}{{^isDiscriminator}}private{{/isDiscriminator}} {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
7475

7576
{{/vars}}
@@ -106,7 +107,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
106107
{{#deprecated}}
107108
@Deprecated
108109
{{/deprecated}}
109-
public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
110+
public {{classname}} {{name}}({{>nullable_var_annotations}} {{{datatypeWithEnum}}} {{name}}) {
110111
this.{{name}} = {{name}};
111112
return this;
112113
}
@@ -153,17 +154,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
153154
{{#deprecated}}
154155
@Deprecated
155156
{{/deprecated}}
156-
{{#required}}
157-
{{#isNullable}}
158-
@{{javaxPackage}}.annotation.Nullable
159-
{{/isNullable}}
160-
{{^isNullable}}
161-
@{{javaxPackage}}.annotation.Nonnull
162-
{{/isNullable}}
163-
{{/required}}
164-
{{^required}}
165-
@{{javaxPackage}}.annotation.Nullable
166-
{{/required}}
157+
{{>nullable_var_annotations}}
167158
{{#useBeanValidation}}
168159
{{>beanValidation}}
169160
{{/useBeanValidation}}
@@ -183,7 +174,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
183174
{{^isReadOnly}}
184175
{{#vendorExtensions.x-setter-extra-annotation}} {{{vendorExtensions.x-setter-extra-annotation}}}
185176
{{/vendorExtensions.x-setter-extra-annotation}}{{#deprecated}} @Deprecated
186-
{{/deprecated}} public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
177+
{{/deprecated}} public void {{setter}}({{>nullable_var_annotations}} {{{datatypeWithEnum}}} {{name}}) {
187178
this.{{name}} = {{name}};
188179
}
189180
{{/isReadOnly}}

generators/java/okhttp-gson/templates/libraries/okhttp-gson/pom.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@
426426
{{/swagger2AnnotationLibrary}}
427427
<okhttp-version>4.12.0</okhttp-version>
428428
<gson-version>2.10.1</gson-version>
429-
<commons-lang3-version>3.14.0</commons-lang3-version>
429+
<commons-lang3-version>3.17.0</commons-lang3-version>
430430
{{#openApiNullable}}
431431
<jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
432432
{{/openApiNullable}}

generators/python/urllib3/templates/SHA256SUM

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
47fdf5141b3d999914c33faff1626c6ac2f00f87fcf9653814084f1dc67351d9 ./README.mustache
33
6a196e67020d765512f0c8c88afc39ef9d3cacdd50a9eba6731a6dbb1997c6e5 ./__init__package.mustache
44
50f1ab5d4640232a6efe52888a7664d60619d7edffc04bdf16fe6fd8c0070a95 ./api_client.mustache
5-
2001a188ffeaeb931e2272f56445bfdb83f078bf2deeb7868021d8a321c3ce8f ./configuration.mustache
6-
5e1131256ad0adbae73204efd8932db30b808b99cfd2ffde6be6ec60ed690fac ./pyproject.mustache
5+
28300d01dcb6061c45c6d68cba198d9ea3243a2650e5859c1f95a3d88520ac3b ./configuration.mustache
6+
f1311d8eea7bc28f5146b9a3cec52d8220e016cb6545c75242e8a11e6c6693d6 ./pyproject.mustache
77
47d0cfca6043fc2c8bd2b5a09704e22b6a412c9ed425c3a83b6ab719cc129986 ./rest.mustache
88
bdd482446d4f3601bebe6fb59dba40748d9e59dc709e9033a354802ff8187eeb ./setup.mustache

0 commit comments

Comments
 (0)