Merge branch 'master' into issue-21317

Author: DavidGrath

.github/workflows/samples-java-client-jdk17.yaml

@@ -7,12 +7,14 @@ on:
       - samples/client/petstore/java/webclient-jakarta/**
       - samples/client/petstore/java/restclient-*/**
       - samples/client/petstore/java/webclient-useSingleRequestParameter/**
+      - samples/client/others/java/restclient-enum-in-multipart/**
   pull_request:
     paths:
       - samples/client/petstore/java/resttemplate-jakarta/**
       - samples/client/petstore/java/webclient-jakarta/**
       - samples/client/petstore/java/restclient-*/**
       - samples/client/petstore/java/webclient-useSingleRequestParameter/**
+      - samples/client/others/java/restclient-enum-in-multipart/**
 jobs:
   build:
     name: Build Java Client JDK17
@@ -30,6 +32,7 @@ jobs:
           - samples/client/petstore/java/restclient-useSingleRequestParameter
           - samples/client/petstore/java/restclient-useSingleRequestParameter-static
           - samples/client/petstore/java/webclient-useSingleRequestParameter
+          - samples/client/others/java/restclient-enum-in-multipart
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

.github/workflows/samples-python-petstore.yaml

@@ -8,6 +8,18 @@ on:
       - .github/workflows/samples-python-petstore.yaml
 
 jobs:
+  validate-pyproject-toml:
+    name: Validate pyproject.toml
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+      - name: Install validator
+        run: pip install 'validate-pyproject[all]'
+      - name: Validate
+        run: validate-pyproject samples/openapi3/client/petstore/python/pyproject.toml
   build:
     name: Test Python client
     runs-on: ubuntu-latest

README.md

@@ -75,7 +75,7 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [<img src="https://openapi-generator.tech/img/companies/dm.png" width="128" height="128">](https://www.dotcom-monitor.com/sponsoring-open-source-projects/?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
 [<img src="https://openapi-generator.tech/img/companies/clickit.jpg" width="128" height="128">](https://www.clickittech.com/?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
 [<img src="https://openapi-generator.tech/img/companies/unified_to.jpg" width="128" height="128">](https://unified.to/?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
-[<img src="https://openapi-generator.tech/img/companies/savetwt.jpg" width="128" height="128">](https://unified.to/?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
+[<img src="https://openapi-generator.tech/img/companies/savetwt.jpg" width="128" height="128">](https://savetwt.com/?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
 
 #### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS, Checkly for sponsoring the API monitoring and Gradle for sponsoring Develocity
 

bin/configs/java-restclient-enum-in-multipart.yaml

@@ -0,0 +1,7 @@
+generatorName: java
+outputDir: samples/client/others/java/restclient-enum-in-multipart
+library: restclient
+inputSpec: modules/openapi-generator/src/test/resources/3_1/enum-in-multipart.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  hideGenerationTimestamp: "true"

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

@@ -429,6 +429,14 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
         CodegenOperation op = super.fromOperation(path, httpMethod, operation, servers);
 
         String underscoredOperationId = underscore(op.operationId);
+        ArrayList<MethodOperation> pathMethods = pathMethodOpMap.get(path);
+
+        // Prevent multiple declarations of the same operation
+        if (pathMethods != null && pathMethods.stream().anyMatch(pathMethod ->
+                pathMethod.operationID.equals(underscoredOperationId))) {
+            return op;
+        }
+
         op.vendorExtensions.put("x-operation-id", underscoredOperationId);
         op.vendorExtensions.put("x-uppercase-operation-id", underscoredOperationId.toUpperCase(Locale.ROOT));
 

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

@@ -350,7 +350,16 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
                 // model oneOf as sealed trait
 
                 CodegenModel cModel = model.getModel();
-                cModel.getVendorExtensions().put("x-isSealedTrait", !cModel.oneOf.isEmpty());
+
+                if (!cModel.oneOf.isEmpty()) {
+                    cModel.getVendorExtensions().put("x-isSealedTrait", true);
+                }
+                else if (cModel.isEnum) {
+                    cModel.getVendorExtensions().put("x-isEnum", true);
+
+                } else {
+                    cModel.getVendorExtensions().put("x-another", true);
+                }
 
                 if (cModel.discriminator != null) {
                     cModel.getVendorExtensions().put("x-use-discr", true);

modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache

@@ -685,6 +685,18 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
         addCookiesToRequest(cookieParams, requestBuilder);
         addCookiesToRequest(defaultCookies, requestBuilder);
 
+        if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
+            formParams.forEach(
+                    (k, v) -> {
+                        if (v instanceof java.util.ArrayList) {
+                            Object o = v.get(0);
+                            if (o != null && o.getClass().getEnumConstants() != null) {
+                                v.set(0, o.toString());
+                            }
+                        }
+                    });
+        }
+
         var selectedBody = selectBody(body, formParams, contentType);
         if (selectedBody != null) {
           requestBuilder.body(selectedBody);

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.20"
+    spring_web_version = "6.2.8"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     {{/useJakartaEe}}

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.20</spring-web-version>
+        <spring-web-version>6.2.8</spring-web-version>
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
         <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useJakartaEe}}

modules/openapi-generator/src/main/resources/Java/libraries/vertx/apiImpl.mustache

@@ -112,7 +112,7 @@ public class {{classname}}Impl implements {{classname}} {
 
     private String encodeParameter(String parameter) {
         try {
-            return URLEncoder.encode(parameter, StandardCharsets.UTF_8.name());
+            return URLEncoder.encode(parameter, StandardCharsets.UTF_8.name()).replaceAll("\\+", "%20");
         } catch (UnsupportedEncodingException e) {
             return parameter;
         }