[BUG][Java][Spring][SpringBoot] optional array with 'minItems' set generates to uninitialized list

.github/workflows/samples-python-fastapi-server.yaml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-python@v6
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         working-directory: ${{ matrix.sample }}
         run: |

bin/configs/html.yaml

@@ -0,0 +1,6 @@
+generatorName: html
+outputDir: samples/documentation/html
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/htmlDocs
+additionalProperties:
+  hideGenerationTimestamp: "true"

bin/configs/swift6-vapor.yaml

@@ -7,6 +7,6 @@ generateAliasAsModel: true
 additionalProperties:
   projectName: PetstoreClient
   useSPMFileStructure: true
-  useClasses: true
+  useClasses: false
   useBacktickEscapes: true
   mapFileBinaryToData: true

bitrise.yml

@@ -27,15 +27,6 @@ workflows:
             set -e
 
             ./samples/client/petstore/swift6/swift6_test_all.sh
-    - script@1.2.0:
-        title: Run Swift5 tests
-        inputs:
-        - content: |
-            #!/usr/bin/env bash
-
-            set -e
-
-            ./samples/client/petstore/swift5/swift5_test_all.sh
     - script@1.2.0:
         title: Run swift-combine tests
         inputs:

modules/openapi-generator/pom.xml

@@ -488,7 +488,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.23.1</version>
+            <version>3.27.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

@@ -1326,8 +1326,8 @@ public String toDefaultValue(CodegenProperty cp, Schema schema) {
                 // if default to empty container option is set, respect the default values provided in the spec
                 return toArrayDefaultValue(cp, schema);
             } else if (schema.getDefault() == null) {
-                // nullable or containerDefaultToNull set to true
-                if (cp.isNullable || containerDefaultToNull) {
+                // nullable or containerDefaultToNull set to true or an optional array with minItems > 0
+                if (cp.isNullable || containerDefaultToNull || (cp.minItems != null && cp.minItems > 0 && !cp.getHasRequired())) {
                     return null;
                 }
                 return getDefaultCollectionType(schema);

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpNextgenClientCodegen.java

@@ -214,7 +214,11 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
                 String phpReturnType = String.join("|", phpReturnTypeOptions);
                 String docReturnType = String.join("|", docReturnTypeOptions);
                 if (hasEmptyResponse) {
-                    phpReturnType = "?" + phpReturnType;
+                    if (phpReturnTypeOptions.size() > 1) {
+                        phpReturnType = phpReturnType + "|null";
+                    } else {
+                        phpReturnType = "?" + phpReturnType;
+                    }
                     docReturnType = docReturnType + "|null";
                 }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java

@@ -330,7 +330,7 @@ public void postProcess() {
 
     @Override
     public String generatorLanguageVersion() {
-        return "3.7";
+        return "3.10";
     }
 
     @Override

modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java

@@ -235,7 +235,7 @@ private static URL getDefaultUrl() {
     public static boolean isRelativeUrl(List<Server> servers) {
         if (servers != null && servers.size() > 0) {
             final Server firstServer = servers.get(0);
-            return Pattern.matches("^(\\/[\\w\\d]+)+", firstServer.getUrl());
+            return Pattern.matches("^(\\/[\\w\\d.~@-]+)+", firstServer.getUrl());
         }
         return false;
     }

modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache

@@ -311,7 +311,7 @@
         {{/useJakartaEe}}
         <threetenbp-version>2.9.10</threetenbp-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <assertj-version>3.23.1</assertj-version>
+        <assertj-version>3.27.7</assertj-version>
         <junit-version>5.10.2</junit-version>
     </properties>
 </project>

modules/openapi-generator/src/main/resources/csharp/AssemblyInfo.mustache

@@ -1,3 +1,4 @@
+{{>partial_header}}
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiFactory.mustache

@@ -1,3 +1,4 @@
+{{>partial_header}}
 using System;
 using Microsoft.Extensions.DependencyInjection;
 using {{packageName}}.{{apiPackage}};

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiKeyToken.mustache

@@ -1,5 +1,6 @@
 // <auto-generated>
-{{partial_header}}
+{{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
@@ -53,4 +54,4 @@ namespace {{packageName}}.{{clientPackage}}
             parseQueryString[ClientUtils.ApiKeyHeaderToString(Header)] = Uri.EscapeDataString(_raw).ToString(){{nrt!}};
         }
     }
-}
+}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponseEventArgs`1.mustache

@@ -1,3 +1,4 @@
+{{>partial_header}}
 using System;
 
 namespace {{packageName}}.{{clientPackage}}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/BasicToken.mustache

@@ -1,5 +1,6 @@
 // <auto-generated>
-{{partial_header}}
+{{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
@@ -43,4 +44,4 @@ namespace {{packageName}}.{{clientPackage}}
             request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", {{packageName}}.Client.ClientUtils.Base64Encode(_username + ":" + _password));
         }
     }
-}
+}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/BearerToken.mustache

@@ -1,5 +1,6 @@
 // <auto-generated>
-{{partial_header}}
+{{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
@@ -38,4 +39,4 @@ namespace {{packageName}}.{{clientPackage}}
             request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", _raw);
         }
     }
-}
+}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/CookieContainer.mustache

@@ -1,5 +1,6 @@
 // <auto-generated>
-{{partial_header}}
+{{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
@@ -19,4 +20,4 @@ namespace {{packageName}}.{{clientPackage}}
         /// </summary>
         public System.Net.CookieContainer Value { get; } = new System.Net.CookieContainer();
     }
-}
+}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ExceptionEventArgs.mustache

@@ -1,3 +1,4 @@
+{{>partial_header}}
 using System;
 
 namespace {{packageName}}.{{clientPackage}}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache

@@ -98,7 +98,7 @@ namespace {{packageName}}.{{clientPackage}}
 
             List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
 
-            {{#apiInfo}}{{#apis}}builders.Add(_services.AddHttpClient<{{interfacePrefix}}{{classname}}, {{classname}}>(client));
+            {{#apiInfo}}{{#apis}}builders.Add(_services.AddHttpClient<{{interfacePrefix}}{{classname}}, {{classname}}>("{{packageName}}.{{apiPackage}}.{{interfacePrefix}}{{classname}}", client));
             {{/apis}}{{/apiInfo}}
             if (builder != null)
                 foreach (IHttpClientBuilder instance in builders)

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HttpSigningToken.mustache

@@ -1,5 +1,6 @@
 // <auto-generated>
-{{partial_header}}
+{{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
@@ -42,4 +43,4 @@ namespace {{packageName}}.{{clientPackage}}
                 request.Headers.Add(signedHeader.Key, signedHeader.Value);
         }
     }
-}
+}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IApi.mustache

@@ -1,3 +1,4 @@
+{{>partial_header}}
 using System.Net.Http;
 
 namespace {{packageName}}.{{apiPackage}}
@@ -12,4 +13,4 @@ namespace {{packageName}}.{{apiPackage}}
         /// </summary>
         HttpClient HttpClient { get; }
     }
-}
+}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonSerializerOptionsProvider.mustache

@@ -1,5 +1,6 @@
 // <auto-generated>
-{{partial_header}}
+{{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
@@ -26,4 +27,4 @@ namespace {{packageName}}.{{clientPackage}}
             Options = options;
         }
     }
-}
+}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OAuthToken.mustache

@@ -1,5 +1,6 @@
 // <auto-generated>
-{{partial_header}}
+{{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
@@ -38,4 +39,4 @@ namespace {{packageName}}.{{clientPackage}}
             request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", _raw);
         }
     }
-}
+}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache

@@ -16,7 +16,11 @@ namespace {{packageName}}.{{clientPackage}}
     /// <typeparam name="TTokenBase"></typeparam>
     {{>visibility}} class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new{{^net70OrLater}} Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>{{/net70OrLater}}();
+        /// <summary>
+        /// Dictionary mapping header names to channels of available tokens for rate limiting.
+        /// Each channel buffers tokens that have become available and are ready for use.
+        /// </summary>
+        protected internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new{{^net70OrLater}} Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>{{/net70OrLater}}();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
@@ -85,7 +89,7 @@ namespace {{packageName}}.{{clientPackage}}
         }
 
         /// <inheritdoc/>
-        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default{{^netstandard20OrLater}}(global::System.Threading.CancellationToken){{/netstandard20OrLater}})
+        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default{{^netstandard20OrLater}}(global::System.Threading.CancellationToken){{/netstandard20OrLater}})
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>{{nrt?}} tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenBase.mustache

@@ -1,5 +1,6 @@
 // <auto-generated>
-{{partial_header}}
+{{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
@@ -17,11 +18,18 @@ namespace {{packageName}}.{{clientPackage}}
         private object _nextAvailableLock = new object();
         private readonly System.Timers.Timer _timer = new System.Timers.Timer();
 
-
         internal TimeSpan? Timeout { get; set; }
+
+        /// <summary>
+        /// Delegate for token availability notification events.
+        /// </summary>
+        /// <param name="sender">The token that became available.</param>
         public delegate void TokenBecameAvailableEventHandler(object sender);
-        public event TokenBecameAvailableEventHandler{{nrt?}} TokenBecameAvailable;
 
+        /// <summary>
+        /// Event raised when a rate-limited token becomes available for use.
+        /// </summary>
+        public event TokenBecameAvailableEventHandler{{nrt?}} TokenBecameAvailable;
 
         /// <summary>
         /// Initialize a TokenBase object.
@@ -35,7 +43,6 @@ namespace {{packageName}}.{{clientPackage}}
                 StartTimer(Timeout.Value);
         }
 
-
         /// <summary>
         /// Starts the token's timer
         /// </summary>
@@ -70,4 +77,4 @@ namespace {{packageName}}.{{clientPackage}}
                 TokenBecameAvailable.Invoke(this);
         }
     }
-}
+}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenContainer`1.mustache

@@ -1,5 +1,6 @@
 // <auto-generated>
-{{partial_header}}
+{{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
@@ -36,4 +37,4 @@ namespace {{packageName}}.{{clientPackage}}
             Tokens = tokens.ToList();
         }
     }
-}
+}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenProvider`1.mustache

@@ -16,6 +16,12 @@ namespace {{packageName}}
     /// </summary>
     {{>visibility}} abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default{{^netstandard20OrLater}}(global::System.Threading.CancellationToken){{/netstandard20OrLater}});
+        /// <summary>
+        /// Gets a token asynchronously for the specified header.
+        /// </summary>
+        /// <param name="header">The header name to retrieve a token for. Empty string for non-API-key authentication schemes.</param>
+        /// <param name="cancellation">Cancellation token for the asynchronous operation.</param>
+        /// <returns>A task that returns the requested token.</returns>
+        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default{{^netstandard20OrLater}}(global::System.Threading.CancellationToken){{/netstandard20OrLater}});
     }
 }

modules/openapi-generator/src/main/resources/htmlDocs/bodyParam.mustache

@@ -1,3 +1,3 @@
-{{#isBodyParam}}<div class="param">{{baseName}} {{#baseType}}<a href="#{{baseType}}">{{baseType}}</a>{{/baseType}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
+{{#isBodyParam}}<div class="param">{{baseName}} {{#isContainer}}{{containerType}}[{{/isContainer}}{{#baseType}}<a href="#{{baseType}}">{{baseType}}</a>{{/baseType}}{{#isContainer}}]{{/isContainer}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
 
       <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; {{unescapedDescription}} {{#defaultValue}}default: {{{.}}}{{/defaultValue}}</div>{{/isBodyParam}}

modules/openapi-generator/src/main/resources/python-fastapi/requirements.mustache

@@ -22,7 +22,7 @@ orjson==3.9.15
 promise==2.3
 pydantic>=2
 python-dotenv==0.17.1
-python-multipart==0.0.18
+python-multipart==0.0.22
 PyYAML>=5.4.1,<6.1.0
 requests==2.32.4
 Rx==1.6.1