Merge remote-tracking branch 'origin/master' into feature/jspecify

# Conflicts:
#	modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java

Author: jpfinne

.github/workflows/samples-dotnet-petstore-net10.yml

@@ -0,0 +1,37 @@
+name: Samples C# .Net 10 Client (Petstore)
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/csharp/restsharp/net10/Petstore/**
+  pull_request:
+    paths:
+      - samples/client/petstore/csharp/restsharp/net10/Petstore/**
+jobs:
+  build:
+    name: Build clients
+    runs-on: ubuntu-latest
+    services:
+      petstore-api:
+        image: swaggerapi/petstore
+        ports:
+          - 80:8080
+        env:
+          SWAGGER_HOST: http://petstore.swagger.io
+          SWAGGER_BASE_PATH: /v2
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/client/petstore/csharp/restsharp/net10/Petstore/
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-dotnet@v5.2.0
+        with:
+          dotnet-version: '10.0.x'
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: dotnet build Org.OpenAPITools.sln
+      - name: Test
+        working-directory: ${{ matrix.sample }}
+        run: dotnet test Org.OpenAPITools.sln

bin/configs/csharp-restsharp-net10-enumNameMappings.yaml

@@ -0,0 +1,15 @@
+# for .net standard
+generatorName: csharp
+library: restsharp
+outputDir: samples/client/petstore/csharp/restsharp/net10/EnumMappings
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  useOneOfDiscriminatorLookup: true
+  targetFramework: net10.0
+  equatable: true
+enumNameMappings:
+  delivered: Shipped

bin/configs/csharp-restsharp-net10.yaml

@@ -1,8 +1,8 @@
 # for .net standard
 generatorName: csharp
 library: restsharp
-outputDir: samples/client/petstore/csharp/restsharp/net10/EnumMappings
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types.yaml
+outputDir: samples/client/petstore/csharp/restsharp/net10/Petstore
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types-localhost.yaml
 templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
@@ -11,5 +11,3 @@ additionalProperties:
   useOneOfDiscriminatorLookup: true
   targetFramework: net10.0
   equatable: true
-enumNameMappings:
-  delivered: Shipped

modules/openapi-generator-gradle-plugin/pom.xml

@@ -99,17 +99,24 @@
                         <arg>-Psigning.secretKeyRingFile=${env.TRAVIS_BUILD_DIR}/sec.gpg</arg>
                         -->
                     </args>
+                    <!-- Force the Gradle daemon to use the same JVM Maven is running with.
+                         This prevents Gradle from picking up a system-level JDK (e.g. JDK 25)
+                         when Maven is configured to run on a different JDK (e.g. JDK 21). -->
+                    <jvmArgs>
+                        <jvmArg>-Dorg.gradle.java.home=${java.home}</jvmArg>
+                    </jvmArgs>
                 </configuration>
                 <executions>
                     <execution>
+                        <id>gradle-build</id>
                         <phase>install</phase>
                         <goals>
                             <!-- goal must be "invoke" -->
                             <goal>invoke</goal>
                         </goals>
                         <configuration>
                             <tasks>
-                                <!-- calls "clean assemble install" -->
+                                <!-- calls "clean build publishToMavenLocal" (build includes tests) -->
                                 <task>clean</task>
                                 <task>build</task>
                                 <task>publishToMavenLocal</task>
@@ -122,6 +129,83 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>skip-gradle-tests</id>
+            <activation>
+                <property>
+                    <name>maven.test.skip</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.fortasoft</groupId>
+                        <artifactId>gradle-maven-plugin</artifactId>
+                        <executions>
+                            <!-- Override the gradle-build execution: keep `build` (so checkstyle,
+                                 spotbugs, and other check-lifecycle tasks still run) but add
+                                 `-x test` to exclude only the Gradle test task, mirroring
+                                 Maven's maven.test.skip behaviour which does not skip quality checks. -->
+                            <execution>
+                                <id>gradle-build</id>
+                                <configuration>
+                                    <args combine.children="append">
+                                        <arg>-x</arg>
+                                        <arg>test</arg>
+                                    </args>
+                                    <tasks>
+                                        <task>clean</task>
+                                        <task>build</task>
+                                        <task>publishToMavenLocal</task>
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>skip-gradle-tests-skipTests</id>
+            <activation>
+                <property>
+                    <name>skipTests</name>
+                    <!-- Maven maps bare -DskipTests to the string "true", so this matches
+                         both -DskipTests and -DskipTests=true but NOT -DskipTests=false. -->
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.fortasoft</groupId>
+                        <artifactId>gradle-maven-plugin</artifactId>
+                        <executions>
+                            <!-- Override the gradle-build execution: keep `build` (so checkstyle,
+                                 spotbugs, and other check-lifecycle tasks still run) but add
+                                 `-x test` to exclude only the Gradle test task.
+                                 combine.children="append" appends to the plugin-level <args>
+                                 instead of replacing them, preserving -P openApiGeneratorVersion. -->
+                            <execution>
+                                <id>gradle-build</id>
+                                <configuration>
+                                    <args combine.children="append">
+                                        <arg>-x</arg>
+                                        <arg>test</arg>
+                                    </args>
+                                    <tasks>
+                                        <task>clean</task>
+                                        <task>build</task>
+                                        <task>publishToMavenLocal</task>
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>static-analysis</id>
             <build>

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

@@ -864,7 +864,13 @@ public void processOpts() {
             additionalProperties.put("feign-okhttp", "true");
         } else if (isLibrary(FEIGN_HC5)) {
             additionalProperties.put("feign-hc5", "true");
-            setTemplateDir(FEIGN);
+            // Only fall back to the built-in "feign" template directory when the user has not
+            // provided a custom template directory.  super.processOpts() already wrote any
+            // user-supplied templateDir back into additionalProperties, so checking for the
+            // key's presence reliably distinguishes "user provided" from "not provided".
+            if (!additionalProperties.containsKey(CodegenConstants.TEMPLATE_DIR)) {
+                setTemplateDir(FEIGN);
+            }
             setLibrary(FEIGN);
         }
 

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

@@ -2,6 +2,7 @@
 
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.io.JsonStringEncoder;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -332,8 +333,8 @@ public void addToMap(CodegenOperation codegenOperation) {
             }
         }
 
-        tagName = formatDescription(tagName);
-        tagDescription = formatDescription(tagDescription);
+        tagName = escapeJsonString(tagName);
+        tagDescription = escapeJsonString(tagDescription);
 
         PostmanRequestFolder folder = new PostmanRequestFolder(tagName, tagDescription);
         List<CodegenOperation> list = codegenOperationsByTag.get(folder);
@@ -685,6 +686,13 @@ public String formatDescription(String description) {
         return description;
     }
 
+    String escapeJsonString(String value) {
+        if (value == null) {
+            return null;
+        }
+        return new String(JsonStringEncoder.getInstance().quoteAsString(value));
+    }
+
     /**
      * Extract all placeholders (string delimited by curly braces ie {{PLACEHOLDER}}) from the input string
      *

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

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.openapitools.codegen.languages;
 
 import io.swagger.v3.oas.models.Operation;
@@ -155,7 +171,8 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("jsonSupport.mustache", invokerFolder, "JsonSupport.scala"));
         supportingFiles.add(new SupportingFile("additionalTypeSerializers.mustache", invokerFolder, "AdditionalTypeSerializers.scala"));
         supportingFiles.add(new SupportingFile("project/build.properties.mustache", "project", "build.properties"));
-        supportingFiles.add(new SupportingFile("dateSerializers.mustache", invokerFolder, "DateSerializers.scala"));
+        supportingFiles.add(new SupportingFile("project/plugins.mustache", "project", "plugins.sbt"));
+        supportingFiles.add(new SupportingFile("scalafmt.mustache", "", ".scalafmt.conf"));
     }
 
     @Override

modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache

@@ -318,10 +318,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    * (except the first line).
    */
   private{{#jsonb}} static{{/jsonb}} String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
+    return o == null ? "null" : o.toString().replace("\n", "\n    ");
   }
 {{#supportUrlQuery}}
 

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache

@@ -97,10 +97,7 @@ public abstract class AbstractOpenApiSchema {
      * (except the first line).
      */
     private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
+        return o == null ? "null" : o.toString().replace("\n", "\n    ");
     }
 
     public boolean equals(Object o) {

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache

@@ -338,10 +338,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    * (except the first line).
    */
   private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
+    return o == null ? "null" : o.toString().replace("\n", "\n    ");
   }
 
 {{#parcelableModel}}