Merge branch 'OpenAPITools:master' into fix/19973

jarryDk · web-flow · commit 1921068aa1cd · 2025-06-04T08:36:59.000+02:00
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,11 +3,11 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>develocity-maven-extension</artifactId>
-        <version>1.21.6</version>
+        <version>1.23.2</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>common-custom-user-data-maven-extension</artifactId>
-        <version>1.12.5</version>
+        <version>1.13</version>
     </extension>
 </extensions>
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java
@@ -232,15 +232,6 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
         if (operations != null) {
             List<CodegenOperation> ops = operations.getOperation();
             for (final CodegenOperation operation : ops) {
-                List<CodegenResponse> responses = operation.responses;
-                if (responses != null) {
-                    for (final CodegenResponse resp : responses) {
-                        // Convert "default" value (0) to OK (200).
-                        if ("0".equals(resp.code)) {
-                            resp.code = "200";
-                        }
-                    }
-                }
                 List<CodegenSecurity> securityMethods = operation.authMethods;
                 if (securityMethods != null) {
                     for (final CodegenSecurity securityMethod : securityMethods) {
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
@@ -126,7 +126,7 @@ ext {
     beanvalidation_version = "3.0.2"
     {{/useJakartaEe}}
     {{^useJakartaEe}}
-    spring_web_version = "6.1.13"
+    spring_web_version = "6.1.20"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     {{/useJakartaEe}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
@@ -367,7 +367,7 @@
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{/openApiNullable}}
         {{#useJakartaEe}}
-        <spring-web-version>6.1.14</spring-web-version>
+        <spring-web-version>6.1.20</spring-web-version>
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
         <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useJakartaEe}}
diff --git a/modules/openapi-generator/src/main/resources/python-fastapi/api.mustache b/modules/openapi-generator/src/main/resources/python-fastapi/api.mustache
@@ -41,7 +41,7 @@ for _, name, _ in pkgutil.iter_modules(ns_pkg.__path__, ns_pkg.__name__ + "."):
     "{{{path}}}",
     responses={
         {{#responses}}
-        {{code}}: {{=<% %>=}}{<%#dataType%>"model": <%dataType%>, "description": "<%message%>"<%/dataType%><%^dataType%>"description": "<%message%>"<%/dataType%>}<%={{ }}=%>,
+        {{#isDefault}}"default"{{/isDefault}}{{^isDefault}}{{code}}{{/isDefault}}: {{=<% %>=}}{<%#dataType%>"model": <%dataType%>, "description": "<%message%>"<%/dataType%><%^dataType%>"description": "<%message%>"<%/dataType%>}<%={{ }}=%>,
         {{/responses}}
     },
     tags=[{{#tags}}"{{name}}"{{^-last}},{{/-last}}{{/tags}}],
diff --git a/samples/client/echo_api/java/resttemplate/build.gradle b/samples/client/echo_api/java/resttemplate/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.13"
+    spring_web_version = "6.1.20"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/client/others/java/resttemplate-list-schema-validation/build.gradle b/samples/client/others/java/resttemplate-list-schema-validation/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.13"
+    spring_web_version = "6.1.20"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle b/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.13"
+    spring_web_version = "6.1.20"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/client/petstore/java/resttemplate-jakarta/pom.xml b/samples/client/petstore/java/resttemplate-jakarta/pom.xml
@@ -277,7 +277,7 @@
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
-        <spring-web-version>6.1.14</spring-web-version>
+        <spring-web-version>6.1.20</spring-web-version>
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
         <beanvalidation-version>3.0.2</beanvalidation-version>
         <junit-version>5.10.2</junit-version>
diff --git a/samples/client/petstore/java/resttemplate-swagger1/build.gradle b/samples/client/petstore/java/resttemplate-swagger1/build.gradle
@@ -101,7 +101,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.13"
+    spring_web_version = "6.1.20"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/client/petstore/java/resttemplate-swagger2/build.gradle b/samples/client/petstore/java/resttemplate-swagger2/build.gradle
@@ -101,7 +101,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.13"
+    spring_web_version = "6.1.20"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.13"
+    spring_web_version = "6.1.20"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.13"
+    spring_web_version = "6.1.20"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/server/petstore/python-fastapi/src/openapi_server/apis/user_api.py b/samples/server/petstore/python-fastapi/src/openapi_server/apis/user_api.py
@@ -39,7 +39,7 @@
 @router.post(
     "/user",
     responses={
-        200: {"description": "successful operation"},
+        "default": {"description": "successful operation"},
     },
     tags=["user"],
     summary="Create user",
@@ -60,7 +60,7 @@ async def create_user(
 @router.post(
     "/user/createWithArray",
     responses={
-        200: {"description": "successful operation"},
+        "default": {"description": "successful operation"},
     },
     tags=["user"],
     summary="Creates list of users with given input array",
@@ -81,7 +81,7 @@ async def create_users_with_array_input(
 @router.post(
     "/user/createWithList",
     responses={
-        200: {"description": "successful operation"},
+        "default": {"description": "successful operation"},
     },
     tags=["user"],
     summary="Creates list of users with given input array",
@@ -164,7 +164,7 @@ async def login_user(
 @router.get(
     "/user/logout",
     responses={
-        200: {"description": "successful operation"},
+        "default": {"description": "successful operation"},
     },
     tags=["user"],
     summary="Logs out current logged in user session",
