Merge branch 'master' into bugfix/pagedModel-use-import-mapping-and-schema-mapping

Author: Picazsoo

.gitignore

@@ -309,3 +309,6 @@ samples/client/petstore/ocaml-recursion-test/_build/
 
 # jetbrain http client
 samples/client/jetbrains/adyen/checkout71/http/client/Apis/http-client.private.env.json
+
+# Generated by the run-in-docker.sh
+\?/

docs/customization.md

@@ -530,7 +530,7 @@ Another useful option is `inlineSchemaOptions`, which allows you to customize ho
 - `MAP_ITEM_SUFFIX` set the map item suffix
 - `SKIP_SCHEMA_REUSE=true` is a special value to skip reusing inline schemas during refactoring
 - `REFACTOR_ALLOF_INLINE_SCHEMAS=true` will restore the 6.x (or below) behaviour to refactor allOf inline schemas into $ref. (v7.0.0 will skip the refactoring of these allOf inline schemas by default)
-- `RESOLVE_INLINE_ENUMS=true` will refactor inline enum definitions into $ref. This must be activated to allow the renaming of inline enum definitions using `inlineSchemaMappings`.
+- `RESOLVE_INLINE_ENUMS=true` will refactor inline enum definitions into $ref. This must be activated to allow the renaming of inline enum definitions using `inlineSchemaNameMappings`.
 
 ## OpenAPI Normalizer
 

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

@@ -12,6 +12,8 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -146,22 +148,28 @@ public Reader getTemplateReader(String name) {
         try {
             InputStream is = getInputStream(name);
             return new InputStreamReader(is, StandardCharsets.UTF_8);
-        } catch (FileNotFoundException e) {
+        } catch (IOException e) {
             LOGGER.error(e.getMessage());
             throw new RuntimeException("can't load template " + name);
         }
     }
 
-    private InputStream getInputStream(String name) throws FileNotFoundException {
-        InputStream is;
-        is = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(name));
-        if (is == null) {
-            if (name == null || name.contains("..")) {
-                throw new IllegalArgumentException("Template location must be constrained to template directory.");
-            }
-            is = new FileInputStream(name); // May throw but never return a null value
+    private InputStream getInputStream(String name) throws IOException {
+        if (name == null || name.contains("..")) {
+            throw new IllegalArgumentException("Template location must be constrained to template directory.");
+        }
+        String cpResourcePath = getCPResourcePath(name);
+        URL resource = this.getClass().getClassLoader().getResource(cpResourcePath);
+        if (resource != null) {
+            // Open a fresh, non-cached connection each time.
+            // setUseCaches(false) prevents sharing the underlying JarFile across classloaders,
+            // which avoids "Stream closed" errors when concurrent Gradle workers use isolated
+            // classloaders that happen to point to the same JAR URL.
+            URLConnection conn = resource.openConnection();
+            conn.setUseCaches(false);
+            return conn.getInputStream();
         }
-        return is;
+        return new FileInputStream(name); // May throw but never return a null value
     }
 
     /**
@@ -180,15 +188,22 @@ public File write(Map<String, Object> data, String template, File target) throws
             return writeToFile(target.getPath(), templateContent);
         } else {
             // Do a straight copy of the file if not listed as supported by the template engine.
-            InputStream is;
+            String fullTemplatePath = null;
             try {
                 // look up the file using the same template resolution logic the adapters would use.
-                String fullTemplatePath = getFullTemplateFile(template);
-                is = getInputStream(fullTemplatePath);
+                fullTemplatePath = getFullTemplateFile(template);
             } catch (TemplateNotFoundException ex) {
-                is = new FileInputStream(Paths.get(template).toFile());
+                // not found on classpath; fall through to direct file read below
+            }
+            if (fullTemplatePath != null) {
+                try (InputStream is = getInputStream(fullTemplatePath)) {
+                    return writeToFile(target.getAbsolutePath(), IOUtils.toByteArray(is));
+                }
+            } else {
+                try (InputStream is = new FileInputStream(Paths.get(template).toFile())) {
+                    return writeToFile(target.getAbsolutePath(), IOUtils.toByteArray(is));
+                }
             }
-            return writeToFile(target.getAbsolutePath(), IOUtils.toByteArray(is));
         }
     }
 

modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache

@@ -81,11 +81,10 @@ public class {{classname}}Controller implements {{classname}} {
 {{^isDelegate}}
     {{^reactive}}
 
-    @Nullable
     private final NativeWebRequest request;
 
     @Autowired
-    public {{classname}}Controller(@Nullable NativeWebRequest request) {
+    public {{classname}}Controller(NativeWebRequest request) {
         this.request = request;
     }
 

modules/openapi-generator/src/main/resources/python-pydantic-v1/asyncio/rest.mustache

@@ -128,6 +128,8 @@ class RESTClientObject:
             if re.search('json', headers['Content-Type'], re.IGNORECASE):
                 if body is not None:
                     body = json.dumps(body)
+                if body is None and post_params:
+                    body = json.dumps(dict(post_params))
                 args["data"] = body
             elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                 args["data"] = aiohttp.FormData(post_params)

modules/openapi-generator/src/main/resources/python-pydantic-v1/rest.mustache

@@ -172,6 +172,8 @@ class RESTClientObject:
                     request_body = None
                     if body is not None:
                         request_body = json.dumps(body)
+                    if body is None and post_params:
+                        request_body = json.dumps(dict(post_params))
                     r = self.pool_manager.request(
                         method, url,
                         body=request_body,

modules/openapi-generator/src/main/resources/python-pydantic-v1/tornado/rest.mustache

@@ -112,6 +112,8 @@ class RESTClientObject:
             if re.search('json', headers['Content-Type'], re.IGNORECASE):
                 if body:
                     body = json.dumps(body)
+                if body is None and post_params:
+                    body = json.dumps(dict(post_params))
                 request.body = body
             elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                 request.body = urlencode(post_params)

modules/openapi-generator/src/main/resources/python/asyncio/rest.mustache

@@ -156,6 +156,8 @@ class RESTClientObject:
             if re.search('json', headers['Content-Type'], re.IGNORECASE):
                 if body is not None:
                     body = json.dumps(body)
+                if body is None and post_params:
+                    body = json.dumps(dict(post_params))
                 args["data"] = body
             elif headers['Content-Type'] == 'application/x-www-form-urlencoded':
                 args["data"] = aiohttp.FormData(post_params)

modules/openapi-generator/src/main/resources/python/httpx/rest.mustache

@@ -128,6 +128,8 @@ class RESTClientObject:
             if re.search('json', headers['Content-Type'], re.IGNORECASE):
                 if body is not None:
                     args["json"] = body
+                if body is None and post_params:
+                    args["json"] = dict(post_params)
             elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
                 args["data"] = dict(post_params)
             elif headers['Content-Type'] == 'multipart/form-data':

modules/openapi-generator/src/main/resources/python/tornado/rest.mustache

@@ -122,6 +122,8 @@ class RESTClientObject:
             if re.search('json', headers['Content-Type'], re.IGNORECASE):
                 if body:
                     body = json.dumps(body)
+                if body is None and post_params:
+                    body = json.dumps(dict(post_params))
                 request.body = body
             elif headers['Content-Type'] == 'application/x-www-form-urlencoded':
                 request.body = urlencode(post_params)