Merge remote-tracking branch 'origin/master'

# Conflicts:
#	bin/configs/java-okhttp-user-defined-templates.yaml
#	modules/openapi-generator/src/main/resources/php-flight/register_routes.mustache
#	modules/openapi-generator/src/main/resources/php-flight/register_routes_test.mustache
#	modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
#	modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml
#	modules/openapi-generator/src/test/resources/3_0/spring/issue_18340.yaml
#	samples/client/echo_api/java/okhttp-gson-user-defined-templates/.github/workflows/maven.yml
#	samples/client/echo_api/java/okhttp-gson-user-defined-templates/.openapi-generator/FILES
#	samples/client/echo_api/java/okhttp-gson-user-defined-templates/gradle/wrapper/gradle-wrapper.jar
#	samples/client/echo_api/java/okhttp-gson-user-defined-templates/gradle/wrapper/gradle-wrapper.properties
#	samples/client/echo_api/java/okhttp-gson-user-defined-templates/gradlew
#	samples/client/echo_api/java/okhttp-gson-user-defined-templates/gradlew.bat
#	samples/client/echo_api/java/okhttp-gson-user-defined-templates/info.md
#	samples/openapi3/client/petstore/python/tests/test_model.py
#	samples/server/petstore/php-flight/RegisterRoutes.php
#	samples/server/petstore/php-flight/Test/RegisterRoutesTest.php

Author: jpfinne

.circleci/config.yml

@@ -141,7 +141,7 @@ commands: # a reusable command with parameters
 jobs:
   node0:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -154,7 +154,7 @@ jobs:
           nodeNo: "0"
   node1:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -167,7 +167,7 @@ jobs:
           nodeNo: "1"
   node2:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -180,7 +180,7 @@ jobs:
           nodeNo: "2"
   node3:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:

.github/workflows/gradle-test.yaml

@@ -10,7 +10,7 @@ on:
       - 'samples/client/petstore/java/**'
       - 'samples/openapi3/client/petstore/java/**'
 env:
-  GRADLE_VERSION: 7.2
+  GRADLE_VERSION: 8.7
 
 jobs:
   build:

.github/workflows/samples-go.yaml

@@ -1,20 +1,22 @@
-name: Samples Go 
+name: Samples Go
 
 on:
   push:
     paths:
       - 'samples/server/petstore/go-echo-server/**'
       - 'samples/server/petstore/go-api-server/**'
       - 'samples/server/petstore/go-chi-server/**'
+      - 'samples/server/others/go-server/no-body-path-params/**'
   pull_request:
     paths:
       - 'samples/server/petstore/go-echo-server/**'
       - 'samples/server/petstore/go-api-server/**'
       - 'samples/server/petstore/go-chi-server/**'
+      - 'samples/server/others/go-server/no-body-path-params/**'
 
 jobs:
   build:
-    name: Build Go 
+    name: Build Go
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -23,6 +25,7 @@ jobs:
           - samples/server/petstore/go-echo-server/
           - samples/server/petstore/go-api-server/
           - samples/server/petstore/go-chi-server/
+          - samples/server/others/go-server/no-body-path-params/
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5

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

@@ -0,0 +1,42 @@
+name: Java Client (Echo API) JDK17
+
+on:
+  push:
+    paths:
+      - samples/client/echo_api/java/restclient
+  pull_request:
+    paths:
+      - samples/client/echo_api/java/restclient
+jobs:
+  build:
+    name: Build Java Client JDK17
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/echo_api/java/restclient
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Cache maven dependencies
+        uses: actions/cache@v4
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.m2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+      - name: Setup node.js
+        uses: actions/setup-node@v4
+      - name: Run echo server
+        run: |
+          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
+          (cd http-echo-server && npm install && npm start &)
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: mvn clean package

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

@@ -5,10 +5,12 @@ on:
     paths:
       - samples/client/petstore/java/resttemplate-jakarta/**
       - samples/client/petstore/java/webclient-jakarta/**
+      - samples/client/petstore/java/restclient-*/** 
   pull_request:
     paths:
       - samples/client/petstore/java/resttemplate-jakarta/**
       - samples/client/petstore/java/webclient-jakarta/**
+      - samples/client/petstore/java/restclient-*/** 
 jobs:
   build:
     name: Build Java Client JDK17
@@ -20,6 +22,9 @@ jobs:
           # clients
           - samples/client/petstore/java/resttemplate-jakarta
           - samples/client/petstore/java/webclient-jakarta
+          - samples/client/petstore/java/restclient
+          - samples/client/petstore/java/restclient-nullable-arrays
+          - samples/client/petstore/java/restclient-swagger2
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -34,9 +39,27 @@ jobs:
           path: |
             ~/.m2
           key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+
       - name: Build with Maven
         working-directory: ${{ matrix.sample }}
         run: mvn clean package
-      - name: Build with Gradle
+
+      - name: Cache gradle dependencies
+        uses: actions/cache@v4
+        env:
+          cache-name: gradle-caches
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
+
+      - name: Cache gradle wrapper
+        uses: actions/cache@v4
+        env:
+          cache-name: gradle-wrapper
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Build
         working-directory: ${{ matrix.sample }}
-        run: gradle clean build
+        run: ./gradlew build -x test

CI/circle_parallel.sh

@@ -110,5 +110,6 @@ else
   (cd samples/client/petstore/java/resteasy && mvn integration-test)
   (cd samples/client/petstore/java-micronaut-client && mvn integration-test)
   (cd samples/client/petstore/java/apache-httpclient && mvn integration-test)
+  (cd samples/client/petstore/java/resttemplate-jakarta && mvn integration-test)
 
 fi

bin/configs/go-server-no-body-path-params.yaml

@@ -0,0 +1,8 @@
+generatorName: go-server
+outputDir: samples/server/others/go-server/no-body-path-params
+inputSpec: modules/openapi-generator/src/test/resources/3_0/go-server/no-body-path-params.yaml
+templateDir: modules/openapi-generator/src/main/resources/go-server
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: petstoreserver
+  addResponseHeaders: true

bin/configs/java-jersey2-special-characters.yaml

@@ -10,6 +10,4 @@ additionalProperties:
   dateLibrary: java8
   useOneOfDiscriminatorLookup: true
   disallowAdditionalPropertiesIfNotPresent: false
-systemProperties:
-  skipValidateSpec: "false"
-
+validateSpec: false

bin/configs/java-okhttp-user-defined-templates.yaml

@@ -6,7 +6,7 @@ templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
   hideGenerationTimestamp: "true"
 files:
-  README.md:
+  README.mustache:
     destinationFilename: info.md
   api_doc.mustache:
     templateType: APIDocs

bin/configs/java-restclient-echo-api.yaml

@@ -0,0 +1,13 @@
+generatorName: java
+outputDir: samples/client/echo_api/java/restclient
+library: restclient
+inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: echo-api-native
+  hideGenerationTimestamp: "true"
+
+typeMappings:
+  OffsetDateTime: "Instant"
+importMappings:
+  OffsetDateTime: "java.time.Instant"