Merge branch 'OpenAPITools:master' into fix/17419_java_useOneOfInterface

Author: Nicklas2751

.github/workflows/openapi-generator-test-results.yaml

@@ -11,7 +11,7 @@ jobs:
   report:
     runs-on: ubuntu-latest
     steps:
-      - uses: dorny/test-reporter@v1
+      - uses: dorny/test-reporter@v2
         with:
           artifact: surefire-test-results
           name: JUnit Test results

.github/workflows/samples-aspnet-fastenpoints-server.yaml

@@ -26,7 +26,7 @@ jobs:
           - samples/server/petstore/aspnet/fastendpoints-useValidators
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: '8.0.x'
       - name: Build

.github/workflows/samples-dotnet-standard.yaml

@@ -28,7 +28,7 @@ jobs:
           # - samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: 3.1.*
       - name: Build

.github/workflows/samples-dotnet6-server.yaml

@@ -25,7 +25,7 @@ jobs:
           - samples/server/petstore/aspnetcore-6.0-useSwashBuckle
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: '6.0.x'
       - name: Build

.github/workflows/samples-dotnet8-client-echo-api.yaml

@@ -19,7 +19,7 @@ jobs:
           - samples/client/echo_api/csharp/restsharp/net8/EchoApi
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: '8.0.x'
       - name: Run echo server

.github/workflows/samples-dotnet8-client.yaml

@@ -19,7 +19,7 @@ jobs:
           - samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: '8.0.x'
       - name: Build

.github/workflows/samples-dotnet8-server.yaml

@@ -26,7 +26,7 @@ jobs:
           - samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: '8.0.x'
       - name: Build

.github/workflows/samples-dotnet8.yaml

@@ -34,7 +34,7 @@ jobs:
           - samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: '8.0.x'
       - name: Build

.github/workflows/samples-dotnet9.yaml

@@ -43,7 +43,7 @@ jobs:
           #- samples/client/petstore/csharp/unityWebRequest/net9/Petstore
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: '9.0.101'
       - name: Build

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

@@ -38,12 +38,13 @@ public class GlobalSettings {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GlobalSettings.class);
 
-    private static ThreadLocal<Properties> properties = new InheritableThreadLocal<Properties>() {
+    private static ThreadLocal<Properties> properties = new InheritableThreadLocal<>() {
         @Override
         protected Properties initialValue() {
             // avoid using System.getProperties().clone() which is broken in Gradle - see https://github.com/gradle/gradle/issues/17344
             Properties copy = new Properties();
-            copy.putAll(System.getProperties());
+            System.getProperties()
+                .forEach((k,v) -> copy.put(String.valueOf(k), String.valueOf(v)));
             return copy;
         }
     };
@@ -69,8 +70,10 @@ public static void reset() {
     }
 
     public static void log() {
-        StringWriter stringWriter = new StringWriter();
-        properties.get().list(new PrintWriter(stringWriter));
-        LOGGER.debug("GlobalSettings: {}", stringWriter);
+        if(LOGGER.isDebugEnabled()) {
+            StringWriter stringWriter = new StringWriter();
+            properties.get().list(new PrintWriter(stringWriter));
+            LOGGER.debug("GlobalSettings: {}", stringWriter);
+        }
     }
 }