Update openapi generator version to v7.10.0 (was v7.9.0) (#154)

onfido · Feb 19, 2025 · e73110a · e73110a
1 parent 5ebe401
commit e73110a
Show file tree

Hide file tree

Showing 14 changed files with 271 additions and 114 deletions.
diff --git a/.github/workflows/update-specs-and-client-libraries.yaml b/.github/workflows/update-specs-and-client-libraries.yaml
@@ -76,7 +76,7 @@ jobs:
       python_version: ${{ steps.generator.outputs.python_urllib3_version }}
       ruby_version: ${{ steps.generator.outputs.ruby_faraday_version }}
     container:
-      image: openapitools/openapi-generator-cli:v7.9.0
+      image: openapitools/openapi-generator-cli:v7.10.0
       env:
         OPENAPI_GENERATOR_COMMAND: docker-entrypoint.sh
         BUMP_CLIENT_LIBRARY_VERSION: ${{ inputs.type-of-change }}

diff --git a/generators/java/okhttp-gson/templates/SHA256SUM b/generators/java/okhttp-gson/templates/SHA256SUM
@@ -1,7 +1,7 @@
 
 16502193337397367078434a27f67edfc6410f4c06d12db876155885d6a49394  ./README.mustache
-9866a9e83531d72f155a0fdea252cfe5d340deea3d6e2da7eb64c941dc88577a  ./libraries/okhttp-gson/ApiClient.mustache
-7db4829dd39d1e769cfe38a07e976684f71e5db4077030ea1b423703958da223  ./libraries/okhttp-gson/api.mustache
-0e77feaf2d6b0818194161ac7e621189aa6e7900b45d46fa4ff1232894bb1a7a  ./libraries/okhttp-gson/oneof_model.mustache
-f20b6129f3b473ecaa4e39f760bb1028d6c1f832928fa2f460131e2c54d66ed0  ./libraries/okhttp-gson/pojo.mustache
-2f63581598dd2ba1373a51c0c3dfbcfa2a43d25f278a048c04c6679ef03f1224  ./libraries/okhttp-gson/pom.mustache
+a82c17a026cf8055c3bcfe41b940b165b5fc7126c58283c4c557d8b9ec668950  ./libraries/okhttp-gson/ApiClient.mustache
+a1de601140f7e476752a87ae96902d45b499c8f8383eced56c6322e61549bdac  ./libraries/okhttp-gson/api.mustache
+245137cb0e10389bbe3b2c3061f3c3baa95ae35575b5b2576e0042a3942b742a  ./libraries/okhttp-gson/oneof_model.mustache
+2c2d109d7248ff40bc3309afd1b0aed95c0c0fac12814fe3354075b6f2649322  ./libraries/okhttp-gson/pojo.mustache
+a3b6ce241edbd6e22b84f54f4c07c59454bc7be4ede93b33c5f034125f97ead6  ./libraries/okhttp-gson/pom.mustache
diff --git a/generators/java/okhttp-gson/templates/libraries/okhttp-gson/ApiClient.mustache b/generators/java/okhttp-gson/templates/libraries/okhttp-gson/ApiClient.mustache
@@ -999,7 +999,7 @@ public class ApiClient {
     }
     {{/dynamicOperations}}
 
-    /**
+   /**
     * Formats the specified free-form query parameters to a list of {@code Pair} objects.
     *
     * @param value The free-form query parameters.
@@ -1013,7 +1013,7 @@ public class ApiClient {
             return params;
         }
 
-        @SuppressWarnings("unchecked"){{! Fix unchecked cast warning }}
+        @SuppressWarnings("unchecked")
         final Map<String, Object> valuesMap = (Map<String, Object>) value;
 
         for (Map.Entry<String, Object> entry : valuesMap.entrySet()) {

diff --git a/generators/java/okhttp-gson/templates/libraries/okhttp-gson/api.mustache b/generators/java/okhttp-gson/templates/libraries/okhttp-gson/api.mustache
@@ -99,7 +99,8 @@ public class {{classname}} {
      * @throws ApiException If fail to serialize the request body object
      {{#responses.0}}
      * @http.response.details
-     <table summary="Response Details" border="1">
+     <table border="1">
+       <caption>Response Details</caption>
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
         {{#responses}}
         <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}} {
 
         {{/isQueryParam}}
         {{/constantParams}}
-        {{#headerParams}}
-        if ({{paramName}} != null) {
-            localVarHeaderParams.put("{{baseName}}", localVarApiClient.parameterToString({{paramName}}));
-        }
-
-        {{/headerParams}}
         {{#constantParams}}
         {{#isHeaderParam}}
         // Set client side default value of Header Param "{{baseName}}".
@@ -231,6 +226,15 @@ public class {{classname}} {
         if (localVarContentType != null) {
             localVarHeaderParams.put("Content-Type", localVarContentType);
         }
+        {{^dynamicOperations}}
+        {{#headerParams}}
+
+        if ({{paramName}} != null) {
+            localVarHeaderParams.put("{{baseName}}", localVarApiClient.parameterToString({{paramName}}));
+        }
+
+        {{/headerParams}}
+        {{/dynamicOperations}}
 
         String[] localVarAuthNames = new String[] { {{#withAWSV4Signature}}"AWS4Auth"{{/withAWSV4Signature}}{{#authMethods}}{{#-first}}{{#withAWSV4Signature}}, {{/withAWSV4Signature}}{{/-first}}"{{name}}"{{^-last}}, {{/-last}}{{/authMethods}} };
         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}} {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      {{#responses.0}}
      * @http.response.details
-     <table summary="Response Details" border="1">
+     <table border="1">
+       <caption>Response Details</caption>
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
         {{#responses}}
         <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}} {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      {{#responses.0}}
      * @http.response.details
-     <table summary="Response Details" border="1">
+     <table border="1">
+       <caption>Response Details</caption>
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
         {{#responses}}
         <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}} {
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      {{#responses.0}}
      * @http.response.details
-     <table summary="Response Details" border="1">
+     <table border="1">
+       <caption>Response Details</caption>
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
         {{#responses}}
         <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}} {
          * @throws ApiException If fail to serialize the request body object
          {{#responses.0}}
          * @http.response.details
-         <table summary="Response Details" border="1">
+         <table border="1">
+       <caption>Response Details</caption>
             <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
             {{#responses}}
             <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}} {
          * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
          {{#responses.0}}
          * @http.response.details
-         <table summary="Response Details" border="1">
+         <table border="1">
+       <caption>Response Details</caption>
             <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
             {{#responses}}
             <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}} {
          * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
          {{#responses.0}}
          * @http.response.details
-         <table summary="Response Details" border="1">
+         <table border="1">
+       <caption>Response Details</caption>
             <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
             {{#responses}}
             <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}} {
          * @throws ApiException If fail to process the API call, e.g. serializing the request body object
          {{#responses.0}}
          * @http.response.details
-         <table summary="Response Details" border="1">
+         <table border="1">
+       <caption>Response Details</caption>
             <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
             {{#responses}}
             <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}} {
      * @return API{{operationId}}Request
      {{#responses.0}}
      * @http.response.details
-     <table summary="Response Details" border="1">
+     <table border="1">
+       <caption>Response Details</caption>
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
         {{#responses}}
         <tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>

diff --git a/generators/java/okhttp-gson/templates/libraries/okhttp-gson/oneof_model.mustache b/generators/java/okhttp-gson/templates/libraries/okhttp-gson/oneof_model.mustache
@@ -378,7 +378,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
 
     {{#composedSchemas}}
     {{#oneOf}}
-    {{^vendorExtensions.x-duplicated-data-type}}
+    {{^vendorExtensions.x-duplicated-data-type-ignoring-erasure}}
     /**
      * Get the actual instance of `{{{dataType}}}`. If the actual instance is not `{{{dataType}}}`,
      * the ClassCastException will be thrown.
@@ -391,10 +391,10 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
     public {{{dataType}}} get{{#sanitizeGeneric}}{{{dataType}}}{{/sanitizeGeneric}}() throws ClassCastException {
         return ({{{dataType}}})super.getActualInstance();
     }
-    {{/vendorExtensions.x-duplicated-data-type}}
+
+    {{/vendorExtensions.x-duplicated-data-type-ignoring-erasure}}
     {{/oneOf}}
     {{/composedSchemas}}
-
     /**
      * Validates the JSON Element and throws an exception if issues found
      *

diff --git a/generators/java/okhttp-gson/templates/libraries/okhttp-gson/pojo.mustache b/generators/java/okhttp-gson/templates/libraries/okhttp-gson/pojo.mustache
@@ -70,6 +70,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#vendorExtensions.x-field-extra-annotation}}
   {{{vendorExtensions.x-field-extra-annotation}}}
   {{/vendorExtensions.x-field-extra-annotation}}
+  {{>nullable_var_annotations}}
   {{#isDiscriminator}}protected{{/isDiscriminator}}{{^isDiscriminator}}private{{/isDiscriminator}} {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
 
   {{/vars}}
@@ -106,7 +107,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#deprecated}}
   @Deprecated
   {{/deprecated}}
-  public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
+  public {{classname}} {{name}}({{>nullable_var_annotations}} {{{datatypeWithEnum}}} {{name}}) {
     this.{{name}} = {{name}};
     return this;
   }
@@ -153,17 +154,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
-{{#required}}
-{{#isNullable}}
-  @{{javaxPackage}}.annotation.Nullable
-{{/isNullable}}
-{{^isNullable}}
-  @{{javaxPackage}}.annotation.Nonnull
-{{/isNullable}}
-{{/required}}
-{{^required}}
-  @{{javaxPackage}}.annotation.Nullable
-{{/required}}
+  {{>nullable_var_annotations}}
 {{#useBeanValidation}}
 {{>beanValidation}}
 {{/useBeanValidation}}
@@ -183,7 +174,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{^isReadOnly}}
 {{#vendorExtensions.x-setter-extra-annotation}}  {{{vendorExtensions.x-setter-extra-annotation}}}
 {{/vendorExtensions.x-setter-extra-annotation}}{{#deprecated}}  @Deprecated
-{{/deprecated}}  public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
+{{/deprecated}}  public void {{setter}}({{>nullable_var_annotations}} {{{datatypeWithEnum}}} {{name}}) {
     this.{{name}} = {{name}};
   }
   {{/isReadOnly}}

diff --git a/generators/java/okhttp-gson/templates/libraries/okhttp-gson/pom.mustache b/generators/java/okhttp-gson/templates/libraries/okhttp-gson/pom.mustache
@@ -426,7 +426,7 @@
         {{/swagger2AnnotationLibrary}}
         <okhttp-version>4.12.0</okhttp-version>
         <gson-version>2.10.1</gson-version>
-        <commons-lang3-version>3.14.0</commons-lang3-version>
+        <commons-lang3-version>3.17.0</commons-lang3-version>
         {{#openApiNullable}}
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{/openApiNullable}}

diff --git a/generators/python/urllib3/templates/SHA256SUM b/generators/python/urllib3/templates/SHA256SUM
@@ -2,7 +2,7 @@
 47fdf5141b3d999914c33faff1626c6ac2f00f87fcf9653814084f1dc67351d9  ./README.mustache
 6a196e67020d765512f0c8c88afc39ef9d3cacdd50a9eba6731a6dbb1997c6e5  ./__init__package.mustache
 50f1ab5d4640232a6efe52888a7664d60619d7edffc04bdf16fe6fd8c0070a95  ./api_client.mustache
-2001a188ffeaeb931e2272f56445bfdb83f078bf2deeb7868021d8a321c3ce8f  ./configuration.mustache
-5e1131256ad0adbae73204efd8932db30b808b99cfd2ffde6be6ec60ed690fac  ./pyproject.mustache
+28300d01dcb6061c45c6d68cba198d9ea3243a2650e5859c1f95a3d88520ac3b  ./configuration.mustache
+f1311d8eea7bc28f5146b9a3cec52d8220e016cb6545c75242e8a11e6c6693d6  ./pyproject.mustache
 47d0cfca6043fc2c8bd2b5a09704e22b6a412c9ed425c3a83b6ab719cc129986  ./rest.mustache
 bdd482446d4f3601bebe6fb59dba40748d9e59dc709e9033a354802ff8187eeb  ./setup.mustache