Merge remote-tracking branch 'origin/master' into ts-angular-update-test

* fix ts angular v20 tetss with correct versions

* restore old version

* fix pom.xml

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!--
 Please follow the issue template below for bug reports and feature requests.
-Also please indicate in the issue title which language/library is concerned. Eg:  [JAVA] Bug generating foo with bar 
+Also please indicate in the issue title which language/library is concerned. E.g.:  [JAVA] Bug generating foo with bar 
 -->
 
 ##### Description

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,7 +18,7 @@ assignees: ''
 
 <!--
 Please follow the issue template below for bug reports.
-Also please indicate in the issue title which language/library is concerned. Eg:  [BUG][JAVA] Bug generating foo with bar 
+Also please indicate in the issue title which language/library is concerned. E.g.:  [BUG][JAVA] Bug generating foo with bar 
 -->
 
 ##### Description

.github/workflows/linux.yaml

@@ -44,12 +44,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v5
         with:
           gradle-version: '8.14.3'
 
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.18.0
+        uses: s4u/setup-maven-action@v1.19.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8
@@ -91,7 +91,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v5
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.18.0
+        uses: s4u/setup-maven-action@v1.19.0
         with:
           java-version: 11
           maven-version: 3.8.8

.github/workflows/samples-clojure.yaml

@@ -0,0 +1,51 @@
+name: Samples Clojure Client
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/clojure/**
+  pull_request:
+    paths:
+      - samples/client/petstore/clojure/**
+jobs:
+  build:
+    name: Build Clojure Client (JDK11)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/client/petstore/clojure/
+    services:
+      petstore-api:
+        image: swaggerapi/petstore
+        ports:
+          - 80:8080
+        env:
+          SWAGGER_HOST: http://petstore.swagger.io
+          SWAGGER_BASE_PATH: /v2
+    steps:
+      - uses: actions/checkout@v5
+      - name: Add hosts to /etc/hosts
+        run: |
+            sudo echo "127.0.0.1 petstore.swagger.io" | sudo tee -a /etc/hosts
+      - uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - 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: Install Leiningen (if using Leiningen)
+        run: |
+          curl https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein > lein
+          chmod +x lein
+          sudo mv lein /usr/local/bin/
+      - name: Run tests (Leiningen)
+        working-directory: ${{ matrix.sample }}
+        run: lein test

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

@@ -0,0 +1,37 @@
+name: Samples C# .Net Client (Petstore)
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/csharp/restsharp/standard2.0/Petstore/**
+  pull_request:
+    paths:
+      - samples/client/petstore/csharp/restsharp/standard2.0/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/standard2.0/Petstore/
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-dotnet@v5.0.0
+        with:
+          dotnet-version: '7.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

.github/workflows/samples-dotnet7-client.yml

@@ -0,0 +1,54 @@
+name: Samples C# .Net 7 Client
+
+on:
+  push:
+    paths:
+      # the .NET Core 3.0 runtime is no longer supported as it reached its end-of-life on March 3, 2020
+      #- samples/client/petstore/csharp/httpclient/standard2.0/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/**
+      - samples/client/petstore/csharp/restsharp/net4.7/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net4.8/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net8/ParameterMappings/**
+      - samples/client/petstore/csharp/restsharp/net8/EnumMappings/**
+      - samples/client/petstore/csharp/restsharp/net8/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/**
+      - samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/**
+  pull_request:
+    paths:
+      #- samples/client/petstore/csharp/httpclient/standard2.0/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/**
+      - samples/client/petstore/csharp/restsharp/net4.7/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net4.8/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net8/ParameterMappings/**
+      - samples/client/petstore/csharp/restsharp/net8/EnumMappings/**
+      - samples/client/petstore/csharp/restsharp/net8/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/**
+      - samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/**
+jobs:
+  build:
+    name: Build clients
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          #- samples/client/petstore/csharp/httpclient/standard2.0/Petstore/
+          - samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/
+          - samples/client/petstore/csharp/restsharp/net4.7/Petstore/
+          - samples/client/petstore/csharp/restsharp/net4.8/Petstore/
+          - samples/client/petstore/csharp/restsharp/net8/ParameterMappings/
+          - samples/client/petstore/csharp/restsharp/net8/EnumMappings/
+          - samples/client/petstore/csharp/restsharp/net8/Petstore/
+          - samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/
+          - samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-dotnet@v5.0.0
+        with:
+          dotnet-version: '7.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

.github/workflows/samples-dotnet9.yaml

@@ -43,6 +43,7 @@ jobs:
           - samples/client/petstore/csharp/restsharp/net9/EnumMappings
           # httpclient
           - samples/client/petstore/csharp/httpclient/net9/Petstore
+          - samples/client/petstore/csharp/httpclient/net9/Petstore-nonPublicApi
           # unity
           #- samples/client/petstore/csharp/unityWebRequest/net9/Petstore
     steps:

.github/workflows/samples-go-client-petstore.yaml

@@ -0,0 +1,45 @@
+name: Samples Go Clients (Petstore)
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/go/**
+      - samples/openapi3/client/petstore/go/**
+  pull_request:
+    paths:
+      - samples/client/petstore/go/**
+      - samples/openapi3/client/petstore/go/**
+
+jobs:
+  build:
+    name: Build Go
+    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/go/
+          - samples/openapi3/client/petstore/go/
+    steps:
+      - uses: actions/checkout@v5
+      - name: Add hosts to /etc/hosts
+        run: |
+            sudo echo "127.0.0.1 petstore.swagger.io" | sudo tee -a /etc/hosts
+      - uses: actions/setup-go@v6
+      - run: go version
+      - name: Install Dependencies
+        working-directory: ${{ matrix.sample }}
+        run: |
+          go mod tidy
+      - name: Run test
+        working-directory: ${{ matrix.sample }}
+        run: go test -mod=mod -v
+

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

@@ -6,12 +6,17 @@ on:
       - 'samples/openapi3/client/petstore/go/go-petstore-aws-signature/**'
       - 'samples/openapi3/client/petstore/go-petstore-withXml/**'
       - samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/**
+      - samples/client/others/go/allof_multiple_ref_and_discriminator/**
+      - samples/client/others/go/oneof-anyof-required/**
+      - samples/client/others/go/oneof-discriminator-lookup/**
   pull_request:
     paths:
       - 'samples/openapi3/client/petstore/go/go-petstore-aws-signature/**'
       - 'samples/openapi3/client/petstore/go-petstore-withXml/**'
       - samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/**
-
+      - samples/client/others/go/allof_multiple_ref_and_discriminator/**
+      - samples/client/others/go/oneof-anyof-required/**
+      - samples/client/others/go/oneof-discriminator-lookup/**
 jobs:
   build:
     name: Build Go
@@ -23,6 +28,9 @@ jobs:
           - 'samples/openapi3/client/petstore/go/go-petstore-aws-signature/'
           - 'samples/openapi3/client/petstore/go-petstore-withXml/'
           - samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/
+          - samples/client/others/go/allof_multiple_ref_and_discriminator/
+          - samples/client/others/go/oneof-anyof-required/
+          - samples/client/others/go/oneof-discriminator-lookup/
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v6

.github/workflows/samples-go.yaml

@@ -6,13 +6,13 @@ on:
       - '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/**'
+      - 'samples/server/others/go-server/**'
   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/**'
+      - 'samples/server/others/go-server/**'
 
 jobs:
   build:
@@ -26,6 +26,7 @@ jobs:
           - samples/server/petstore/go-api-server/
           - samples/server/petstore/go-chi-server/
           - samples/server/others/go-server/no-body-path-params/
+          - samples/server/others/go-server/optional-body/
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v6
@@ -58,4 +59,4 @@ jobs:
           go mod tidy
       - name: Run tests
         working-directory: ${{ matrix.sample }}
-        run: go test ./samples_tests -v
+        run: go test ./samples_tests -v

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

@@ -5,6 +5,7 @@ on:
     paths:
       - 'samples/client/petstore/java/**'
       - samples/client/petstore/jaxrs-cxf-client/**
+      - samples/client/petstore/jaxrs-cxf-client-swagger2/**
       - samples/client/petstore/java-micronaut-client/**
       - samples/openapi3/client/petstore/java/jersey2-java8-special-characters/**
       - samples/openapi3/client/petstore/java/jersey2-java8-swagger1/**
@@ -17,12 +18,17 @@ on:
       - samples/client/petstore/java/webclient-useSingleRequestParameter/**
       - samples/client/others/java/jersey2-oneOf-duplicates/**
       - samples/client/others/java/jersey2-oneOf-Mixed/**
+      - samples/client/petstore/java/jersey3-oneOf/**
+      - samples/client/others/java/okhttp-gson-streaming/**
+      - samples/client/others/java/resteasy/**
+      - samples/client/others/java/apache-httpclient/**
       - samples/client/others/java/resttemplate-list-schema-validation/**
       - samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/**
   pull_request:
     paths:
       - 'samples/client/petstore/java/**'
       - samples/client/petstore/jaxrs-cxf-client/**
+      - samples/client/petstore/jaxrs-cxf-client-swagger2/**
       - samples/client/petstore/java-micronaut-client/**
       - samples/openapi3/client/petstore/java/jersey2-java8-special-characters/**
       - samples/openapi3/client/petstore/java/jersey2-java8-swagger1/**
@@ -35,6 +41,10 @@ on:
       - samples/client/petstore/java/webclient-useSingleRequestParameter/**
       - samples/client/others/java/jersey2-oneOf-duplicates/**
       - samples/client/others/java/jersey2-oneOf-Mixed/**
+      - samples/client/petstore/java/jersey3-oneOf/**
+      - samples/client/others/java/okhttp-gson-streaming/**
+      - samples/client/others/java/resteasy/**
+      - samples/client/others/java/apache-httpclient/**
       - samples/client/others/java/resttemplate-list-schema-validation/**
       - samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/**
 jobs:
@@ -46,6 +56,7 @@ jobs:
       matrix:
         sample:
           # clients
+          - samples/client/petstore/jaxrs-cxf-client-swagger2
           - samples/client/petstore/jaxrs-cxf-client
           - samples/client/petstore/java/native
           - samples/client/petstore/java/native-async
@@ -97,6 +108,10 @@ jobs:
           - samples/client/others/java/jersey2-oneOf-Mixed/
           - samples/client/others/java/resttemplate-list-schema-validation/
           - samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/
+          - samples/client/petstore/java/jersey3-oneOf/
+          - samples/client/others/java/okhttp-gson-streaming/
+          - samples/client/petstore/java/resteasy/
+          - samples/client/petstore/java/apache-httpclient/
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-java@v5

.github/workflows/samples-java-petsore-client-jdk11.yaml

@@ -0,0 +1,65 @@
+# run java client tests with petstore server
+name: Samples Java Petsore Client JDK11
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/java/jersey2-java8/**
+      - samples/openapi3/client/petstore/java/jersey2-java8/**
+      - samples/client/petstore/java/jersey3/**
+      - samples/client/petstore/java/okhttp-gson/**
+      - samples/client/petstore/java/okhttp-gson-3.1/**
+      - samples/client/petstore/java/okhttp-gson-dynamicOperations/**
+      - samples/client/petstore/java-micronaut-client/**
+  pull_request:
+    paths:
+      - samples/client/petstore/java/jersey2-java8/**
+      - samples/openapi3/client/petstore/java/jersey2-java8/**
+      - samples/client/petstore/java/jersey3/**
+      - samples/client/petstore/java/okhttp-gson/**
+      - samples/client/petstore/java/okhttp-gson-3.1/**
+      - samples/client/petstore/java/okhttp-gson-dynamicOperations/**
+      - samples/client/petstore/java-micronaut-client/**
+jobs:
+  build:
+    name: Build Java Client JDK11
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/client/petstore/java/jersey2-java8
+          - samples/openapi3/client/petstore/java/jersey2-java8
+          - samples/client/petstore/java/jersey3
+          - samples/client/petstore/java/okhttp-gson
+          - samples/client/petstore/java/okhttp-gson-3.1
+          - samples/client/petstore/java/okhttp-gson-dynamicOperations
+          - samples/client/petstore/java-micronaut-client
+    services:
+      petstore-api:
+        image: swaggerapi/petstore
+        ports:
+          - 80:8080
+        env:
+          SWAGGER_HOST: http://petstore.swagger.io
+          SWAGGER_BASE_PATH: /v2
+    steps:
+      - uses: actions/checkout@v5
+      - name: Add hosts to /etc/hosts
+        run: |
+            sudo echo "127.0.0.1 petstore.swagger.io" | sudo tee -a /etc/hosts
+      - uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - 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: Build with Maven
+        working-directory: ${{ matrix.sample }}
+        run: mvn clean package --no-transfer-progress

.github/workflows/samples-java-sbt.yaml

@@ -0,0 +1,38 @@
+name: Samples Java (sbt)
+
+on:
+  push:
+    paths:
+      - 'samples/client/petstore/java/okhttp-gson/**'
+  pull_request:
+    paths:
+      - 'samples/client/petstore/java/okhttp-gson/**'
+jobs:
+  build:
+    name: Build sbt/Java client, servers
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/petstore/java/okhttp-gson
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - name: Setup sbt launcher
+        uses: sbt/setup-sbt@v1
+      - name: Cache maven dependencies
+        uses: actions/cache@v4
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.ivy2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/build.sbt') }}
+      - name: Build and test
+        working-directory: ${{ matrix.sample }}
+        run: sbt -v +test

.github/workflows/samples-javascript.yaml

@@ -0,0 +1,51 @@
+name: Samples JS clients
+
+on:
+  push:
+    paths:
+      #- samples/client/petstore/javascript-flowtyped/**
+      - samples/client/petstore/javascript-es6/**
+      - samples/client/petstore/javascript-promise-es6/**
+  pull_request:
+    paths:
+      #- samples/client/petstore/javascript-flowtyped/**
+      - samples/client/petstore/javascript-es6/**
+      - samples/client/petstore/javascript-promise-es6/**
+jobs:
+  build:
+    name: Build projects
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        node:
+          - "18.x"
+          - "20.x"
+        sample:
+          # clients
+          - samples/client/petstore/javascript-es6/
+          - samples/client/petstore/javascript-promise-es6/
+    services:
+      petstore-api:
+        image: swaggerapi/petstore
+        ports:
+          - 80:8080
+        env:
+          SWAGGER_HOST: http://petstore.swagger.io
+          SWAGGER_BASE_PATH: /v2
+    steps:
+      - uses: actions/checkout@v5
+      - name: Add hosts to /etc/hosts
+        run: |
+            sudo echo "127.0.0.1 petstore.swagger.io" | sudo tee -a /etc/hosts
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v5
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'npm' # Or 'yarn'
+      - name: npm install
+        working-directory: ${{ matrix.sample }}
+        run: npm install
+      - name: npm test
+        working-directory: ${{ matrix.sample }}
+        run: npm test

.github/workflows/samples-jaxrs.yaml

@@ -20,10 +20,7 @@ jobs:
           - samples/server/petstore/jaxrs/jersey2-useTags
           - samples/server/petstore/jaxrs-jersey
           - samples/server/petstore/jaxrs-spec
-          - samples/server/petstore/jaxrs-spec-interface
-          - samples/server/petstore/jaxrs-spec-interface-response
-          - samples/server/petstore/jaxrs-jersey
-          - samples/server/petstore/jaxrs-spec
+          - samples/server/petstore/jaxrs-spec-withxml
           - samples/server/petstore/jaxrs-spec-interface
           - samples/server/petstore/jaxrs-spec-interface-response
           - samples/server/petstore/jaxrs-datelib-j8

.github/workflows/samples-kotlin-server-jdk17.yaml

@@ -34,6 +34,7 @@ jobs:
           # server
           - samples/server/petstore/kotlin-server-required-and-nullable-properties
           - samples/server/petstore/kotlin-springboot-3
+          - samples/server/petstore/kotlin-springboot-additionalproperties
           - samples/server/petstore/kotlin-springboot-delegate-nodefaults
           - samples/server/petstore/kotlin-springboot-request-cookie
           - samples/server/petstore/kotlin-server/jaxrs-spec
@@ -67,4 +68,4 @@ jobs:
           arguments: wrapper
       - name: Build
         working-directory: ${{ matrix.sample }}
-        run: ./gradlew build -x test
+        run: ./gradlew build -x test

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

@@ -76,4 +76,4 @@ jobs:
           arguments: wrapper
       - name: Build
         working-directory: ${{ matrix.sample }}
-        run: ./gradlew build -x test
+        run: ./gradlew build -x test

.github/workflows/samples-powershell.yaml

@@ -0,0 +1,40 @@
+name: Samples PowerShell
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/powershell/**
+  pull_request:
+    paths:
+      - samples/client/petstore/powershell/**
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Test Powershell Clients
+    strategy:
+      matrix:
+        sample:
+          - samples/client/petstore/powershell/
+    services:
+      petstore-api:
+        image: swaggerapi/petstore
+        ports:
+          - 80:8080
+        env:
+          SWAGGER_HOST: http://petstore.swagger.io
+          SWAGGER_BASE_PATH: /v2
+    steps:
+      - uses: actions/checkout@v5
+      - name: Build the client
+        working-directory: ${{ matrix.sample }}
+        shell: pwsh
+        run: |
+          ./Build.ps1
+      - name: Test
+        working-directory: ${{ matrix.sample }}
+        shell: pwsh
+        run: |
+          Import-Module -Name './src/PSPetstore'
+          Invoke-Pester -PassThru
+
+

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

@@ -34,6 +34,7 @@ jobs:
           - "3.13"
         sample:
           - samples/openapi3/client/petstore/python-aiohttp
+          - samples/openapi3/client/petstore/python-httpx
           - samples/openapi3/client/petstore/python
           - samples/openapi3/client/petstore/python-lazyImports
     services:

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

@@ -0,0 +1,70 @@
+name: Samples Scala/sbt client
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/scalaz/**
+      - samples/client/petstore/scala-pekko/**
+      - samples/client/petstore/scala-http4s/**
+      - samples/client/petstore/scala-sttp4-jsoniter/**
+      - samples/client/petstore/scala-akka/**
+      - samples/client/petstore/scala-sttp/**
+      - samples/client/petstore/scala-sttp-circe/**
+      - samples/client/petstore/scala-sttp4/**
+  pull_request:
+    paths:
+      - samples/client/petstore/scalaz/**
+      - samples/client/petstore/scala-pekko/**
+      - samples/client/petstore/scala-http4s/**
+      - samples/client/petstore/scala-sttp4-jsoniter/**
+      - samples/client/petstore/scala-akka/**
+      - samples/client/petstore/scala-sttp/**
+      - samples/client/petstore/scala-sttp-circe/**
+      - samples/client/petstore/scala-sttp4/**
+jobs:
+  build:
+    name: Build sbt/Scala
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/petstore/scalaz
+          - samples/client/petstore/scala-pekko
+          - samples/client/petstore/scala-http4s
+          - samples/client/petstore/scala-sttp4-jsoniter
+          - samples/client/petstore/scala-akka
+          - samples/client/petstore/scala-sttp
+          - samples/client/petstore/scala-sttp-circe
+          - samples/client/petstore/scala-sttp4
+    services:
+      petstore-api:
+        image: swaggerapi/petstore
+        ports:
+          - 80:8080
+        env:
+          SWAGGER_HOST: http://petstore.swagger.io
+          SWAGGER_BASE_PATH: /v2
+    steps:
+      - uses: actions/checkout@v5
+      - name: Add hosts to /etc/hosts
+        run: |
+            sudo echo "127.0.0.1 petstore.swagger.io" | sudo tee -a /etc/hosts
+      - uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - name: Setup sbt launcher
+        uses: sbt/setup-sbt@v1
+      - name: Cache maven dependencies
+        uses: actions/cache@v4
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.ivy2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/build.sbt') }}
+      - name: Build and test
+        working-directory: ${{ matrix.sample }}
+        run: sbt -v test

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

@@ -1,34 +1,21 @@
-name: Samples Scala/sbt
+name: Samples Scala/sbt server
 
 on:
   push:
     paths:
-      - 'samples/client/petstore/scala**'
       - 'samples/server/petstore/scala**'
-      - 'samples/client/petstore/java/okhttp-gson/**'
   pull_request:
     paths:
-      - 'samples/client/petstore/scala**'
       - 'samples/server/petstore/scala**'
-      - 'samples/client/petstore/java/okhttp-gson/**'
 jobs:
   build:
-    name: Build sbt/Scala client, servers
+    name: Build sbt/Scala
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         sample:
-          # clients
-          - samples/client/petstore/java/okhttp-gson
-          - samples/client/petstore/scalaz
-          - samples/client/petstore/scala-pekko
-          - samples/client/petstore/scala-http4s
-          - samples/client/petstore/scala-sttp4-jsoniter
-          #- samples/client/petstore/scala-sttp
-          #- samples/client/petstore/scala-sttp-circe
           # servers
-          - samples/server/petstore/scala-lagom-server
           - samples/server/petstore/scala-play-server
           - samples/server/petstore/scala-akka-http-server
           - samples/server/petstore/scala-pekko-http-server

.github/workflows/samples-spring-jdk17.yaml

@@ -11,6 +11,7 @@ on:
       - samples/server/petstore/springboot-file-delegate-optional
       - samples/server/petstore/springboot-petstore-with-api-response-examples
       - samples/server/petstore/spring-boot-oneof-sealed
+      - samples/openapi3/server/petstore/spring-boot-oneof-interface
   pull_request:
     paths:
       - samples/openapi3/client/petstore/spring-cloud-3-with-optional
@@ -21,6 +22,7 @@ on:
       - samples/server/petstore/springboot-file-delegate-optional
       - samples/server/petstore/springboot-petstore-with-api-response-examples
       - samples/server/petstore/spring-boot-oneof-sealed
+      - samples/openapi3/server/petstore/spring-boot-oneof-interface
 jobs:
   build:
     name: Build Java Spring (JDK17)
@@ -39,6 +41,7 @@ jobs:
           - samples/server/petstore/springboot-file-delegate-optional
           - samples/server/petstore/springboot-petstore-with-api-response-examples
           - samples/server/petstore/spring-boot-oneof-sealed
+          - samples/openapi3/server/petstore/spring-boot-oneof-interface
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-java@v5

.github/workflows/samples-spring.yaml

@@ -60,6 +60,7 @@ jobs:
           - samples/server/petstore/springboot-spring-provide-args
           - samples/server/petstore/springboot-useoptional
           - samples/server/petstore/springboot-virtualan
+          - samples/openapi3/server/petstore/spring-boot-oneof-interface
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-java@v5

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

@@ -0,0 +1,142 @@
+name: Samples TS clients
+
+on:
+  push:
+    paths:
+      - samples/client/others/typescript-angular/**
+      # comment out angular released before Nov 2023
+      #- samples/client/petstore/typescript-angular-v12-provided-in-root/**
+      #- samples/client/petstore/typescript-angular-v13-provided-in-root/**
+      #- samples/client/petstore/typescript-angular-v14-provided-in-root/**
+      #- samples/client/petstore/typescript-angular-v15-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v16-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v17-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v18-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v19-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v20-provided-in-root/**
+      - samples/openapi3/client/petstore/typescript/builds/default/**
+      # comment out due to build failure
+      #- samples/openapi3/client/petstore/typescript/tests/default/**
+      - samples/openapi3/client/petstore/typescript/builds/jquery/**
+      # comment out due to build failure
+      #- samples/openapi3/client/petstore/typescript/tests/jquery/**
+      - samples/openapi3/client/petstore/typescript/builds/object_params/**
+      # comment out due to build failure
+      #- samples/openapi3/client/petstore/typescript/tests/object_params/**
+      #- samples/openapi3/client/petstore/typescript/builds/inversify/**
+      #- samples/openapi3/client/petstore/typescript/tests/inversify/**
+      #- samples/openapi3/client/petstore/typescript/tests/deno/**
+      - samples/openapi3/client/petstore/typescript/builds/browser/**
+      # comment out due to build failure
+      #- samples/openapi3/client/petstore/typescript/tests/browser/**
+      #- samples/openapi3/client/petstore/typescript/builds/nullable-enum/**
+      - samples/client/petstore/typescript-fetch/builds/default/**
+      - samples/client/petstore/typescript-fetch/builds/es6-target/**
+      - samples/client/petstore/typescript-fetch/builds/with-npm-version/**
+      - samples/client/petstore/typescript-fetch/tests/default/**
+      # comment out due to build failure
+      #- samples/client/petstore/typescript-node/npm/**
+      - samples/client/petstore/typescript-rxjs/builds/with-npm-version/**
+      - samples/client/petstore/typescript-axios/builds/with-npm-version/**
+      # comment out due to build failure
+      #- samples/client/petstore/typescript-axios/tests/default/**
+  pull_request:
+    paths:
+      - samples/client/others/typescript-angular/**
+      #- samples/client/petstore/typescript-angular-v12-provided-in-root/**
+      #- samples/client/petstore/typescript-angular-v13-provided-in-root/**
+      #- samples/client/petstore/typescript-angular-v14-provided-in-root/**
+      #- samples/client/petstore/typescript-angular-v15-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v16-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v17-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v18-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v19-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v20-provided-in-root/**
+      - samples/openapi3/client/petstore/typescript/builds/default/**
+      #- samples/openapi3/client/petstore/typescript/tests/default/**
+      - samples/openapi3/client/petstore/typescript/builds/jquery/**
+      #- samples/openapi3/client/petstore/typescript/tests/jquery/**
+      - samples/openapi3/client/petstore/typescript/builds/object_params/**
+      #- samples/openapi3/client/petstore/typescript/tests/object_params/**
+      #- samples/openapi3/client/petstore/typescript/builds/inversify/**
+      #- samples/openapi3/client/petstore/typescript/tests/inversify/**
+      #- samples/openapi3/client/petstore/typescript/tests/deno/**
+      - samples/openapi3/client/petstore/typescript/builds/browser/**
+      #- samples/openapi3/client/petstore/typescript/tests/browser/**
+      #- samples/openapi3/client/petstore/typescript/builds/nullable-enum/**
+      - samples/client/petstore/typescript-fetch/builds/default/**
+      - samples/client/petstore/typescript-fetch/builds/es6-target/**
+      - samples/client/petstore/typescript-fetch/builds/with-npm-version/**
+      - samples/client/petstore/typescript-fetch/tests/default/**
+      #- samples/client/petstore/typescript-node/npm/**
+      - samples/client/petstore/typescript-rxjs/builds/with-npm-version/**
+      - samples/client/petstore/typescript-axios/builds/with-npm-version/**
+      #- samples/client/petstore/typescript-axios/tests/default/**
+jobs:
+  build:
+    name: Build projects
+    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:
+        node:
+          #- "18.x"
+          - "20.x"
+        sample:
+          - samples/client/others/typescript-angular/
+          #- samples/client/petstore/typescript-angular-v12-provided-in-root/
+          #- samples/client/petstore/typescript-angular-v13-provided-in-root/
+          #- samples/client/petstore/typescript-angular-v14-provided-in-root/
+          #- samples/client/petstore/typescript-angular-v15-provided-in-root/
+          - samples/client/petstore/typescript-angular-v16-provided-in-root/
+          - samples/client/petstore/typescript-angular-v17-provided-in-root/
+          - samples/client/petstore/typescript-angular-v18-provided-in-root/
+          - samples/client/petstore/typescript-angular-v19-provided-in-root/
+          - samples/client/petstore/typescript-angular-v20-provided-in-root/
+          - samples/openapi3/client/petstore/typescript/builds/default/
+          #- samples/openapi3/client/petstore/typescript/tests/default/
+          - samples/openapi3/client/petstore/typescript/builds/jquery/
+          #- samples/openapi3/client/petstore/typescript/tests/jquery/
+          - samples/openapi3/client/petstore/typescript/builds/object_params/
+          #- samples/openapi3/client/petstore/typescript/tests/object_params/
+          #- samples/openapi3/client/petstore/typescript/builds/inversify/
+          #- samples/openapi3/client/petstore/typescript/tests/inversify/
+          #- samples/openapi3/client/petstore/typescript/tests/deno/
+          - samples/openapi3/client/petstore/typescript/builds/browser/
+          #- samples/openapi3/client/petstore/typescript/tests/browser/
+          #- samples/openapi3/client/petstore/typescript/builds/nullable-enum/
+          - samples/client/petstore/typescript-fetch/builds/default/
+          - samples/client/petstore/typescript-fetch/builds/es6-target/
+          - samples/client/petstore/typescript-fetch/builds/with-npm-version/
+          - samples/client/petstore/typescript-fetch/tests/default/
+          #- samples/client/petstore/typescript-node/npm/
+          - samples/client/petstore/typescript-rxjs/builds/with-npm-version/
+          - samples/client/petstore/typescript-axios/builds/with-npm-version/
+          #- samples/client/petstore/typescript-axios/tests/default/
+    steps:
+      - uses: actions/checkout@v5
+      - name: Add hosts to /etc/hosts
+        run: |
+            sudo echo "127.0.0.1 petstore.swagger.io" | sudo tee -a /etc/hosts
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          java-version: '17' # Specify your desired Java version
+          distribution: 'temurin' # Or 'adopt', 'oracle', etc.
+          cache: maven # Cache Maven dependencies for faster builds
+      - name: Use Node.js
+        uses: actions/setup-node@v5
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'npm' # Or 'yarn'
+      - name: mvn integration-test
+        working-directory: ${{ matrix.sample }}
+        run: mvn integration-test

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

@@ -0,0 +1,34 @@
+name: Samples TS servers
+
+on:
+  push:
+    paths:
+      - samples/server/petstore/typescript-nestjs-server/**
+  pull_request:
+    paths:
+      - samples/server/petstore/typescript-nestjs-server/**
+jobs:
+  build:
+    name: Build projects
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        node:
+          - "18.x"
+          - "20.x"
+        sample:
+          - samples/server/petstore/typescript-nestjs-server/
+    steps:
+      - uses: actions/checkout@v5
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v5
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'npm' # Or 'yarn'
+      - name: npm install
+        working-directory: ${{ matrix.sample }}
+        run: npm install
+      - name: npm test
+        working-directory: ${{ matrix.sample }}
+        run: npm test

.github/workflows/windows.yaml

@@ -39,7 +39,7 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.18.0
+        uses: s4u/setup-maven-action@v1.19.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8

.gitignore

@@ -49,6 +49,8 @@ nb-configuration.xml
 *.xml~
 *.t~
 
+**/.angular
+
 /target
 /generated-files
 test-output/

CI/.travis.yml.bash

@@ -1,37 +0,0 @@
-sudo: required
-language: java
-jdk:
-  - openjdk8
-
-cache:
-  directories:
-  - $HOME/.m2
-  - $HOME/.ivy2
-
-services:
-  - docker
-
-addons:
-  hosts:
-    - petstore.swagger.io
-
-before_install:
-  # to run petstore server locally via docker
-  - docker pull swaggerapi/petstore
-  - docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
-  - docker ps -a
-  # Add bats test framework and cURL for Bash script integration tests
-  - sudo add-apt-repository ppa:duggan/bats --yes
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq bats
-  - sudo apt-get install -qq curl
-
-  # show host table to confirm petstore.swagger.io is mapped to localhost
-  - cat /etc/hosts
-
-script:
-  # fail fast
-  - set -e
-  # run integration tests defined in maven pom.xml
-  - cp pom.xml.bash pom.xml
-  - mvn --no-snapshot-updates --batch-mode verify -Psamples

CI/circle_parallel.sh

@@ -56,87 +56,60 @@ elif [ "$NODE_INDEX" = "2" ]; then
   sudo ./setup-cpp-x64-linux --compiler llvm --cmake true --ninja true
   source ~/.cpprc # activate cpp environment variables
 
-  # run go integration tests
-  (cd samples/client/petstore/go && mvn integration-test)
-  (cd samples/openapi3/client/petstore/go && mvn integration-test)
-  (cd samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false && mvn integration-test)
-  (cd samples/client/others/go/allof_multiple_ref_and_discriminator && mvn integration-test)
   (cd samples/client/petstore/cpp-restsdk/client && mvn integration-test)
 
 elif [ "$NODE_INDEX" = "3" ]; then
 
   echo "Running node $NODE_INDEX ... "
 
-  # Install node@stable (for angular 6)
-  set +e
-  curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
-  export NVM_DIR="/opt/circleci/.nvm"
-  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-  #nvm install stable
-  # install v16 instead of the latest stable version
-  nvm install 18
-  nvm alias default 18
-  node --version
+  ## Install node@stable (for angular 6)
+  #set +e
+  #curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
+  #export NVM_DIR="/opt/circleci/.nvm"
+  #[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+  ##nvm install stable
+  ## install v16 instead of the latest stable version
+  #nvm install 18
+  #nvm alias default 18
+  #node --version
 
-  # Each step uses the same `$BASH_ENV`, so need to modify it
-  echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
-  echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV
+  ## Each step uses the same `$BASH_ENV`, so need to modify it
+  #echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
+  #echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV
 
-  (cd samples/client/others/typescript-angular && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v12-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v13-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v14-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v15-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v16-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v17-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v18-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v19-provided-in-root && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/default && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/default && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/jquery && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/jquery && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/object_params && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/object_params && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/inversify && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/inversify && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/tests/deno && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/browser && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/browser && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/nullable-enum && mvn integration-test)
-  (cd samples/client/petstore/typescript-fetch/builds/default && mvn integration-test)
-  (cd samples/client/petstore/typescript-fetch/builds/es6-target && mvn integration-test)
-  (cd samples/client/petstore/typescript-fetch/builds/with-npm-version && mvn integration-test)
-  (cd samples/client/petstore/typescript-fetch/tests/default && mvn integration-test)
-  (cd samples/client/petstore/typescript-node/npm && mvn integration-test)
-  (cd samples/client/petstore/typescript-rxjs/builds/with-npm-version && mvn integration-test)
-  (cd samples/client/petstore/typescript-axios/builds/with-npm-version && mvn integration-test)
-  (cd samples/client/petstore/typescript-axios/tests/default && mvn integration-test)
-  (cd samples/client/petstore/typescript-axios/tests/with-complex-headers && mvn integration-test)
-  (cd samples/client/petstore/javascript-flowtyped && mvn integration-test)
-  (cd samples/client/petstore/javascript-es6 && mvn integration-test)
-  (cd samples/client/petstore/javascript-promise-es6 && mvn integration-test)
-  (cd samples/server/petstore/typescript-nestjs-server && mvn integration-test)
+  #(cd samples/client/others/typescript-angular && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v12-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v13-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v14-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v15-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v16-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v17-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v18-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v19-provided-in-root && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/builds/default && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/tests/default && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/builds/jquery && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/tests/jquery && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/builds/object_params && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/tests/object_params && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/builds/inversify && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/tests/inversify && mvn integration-test)
+  ##(cd samples/openapi3/client/petstore/typescript/tests/deno && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/builds/browser && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/tests/browser && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/builds/nullable-enum && mvn integration-test)
+  #(cd samples/client/petstore/typescript-fetch/builds/default && mvn integration-test)
+  #(cd samples/client/petstore/typescript-fetch/builds/es6-target && mvn integration-test)
+  #(cd samples/client/petstore/typescript-fetch/builds/with-npm-version && mvn integration-test)
+  #(cd samples/client/petstore/typescript-fetch/tests/default && mvn integration-test)
+  #(cd samples/client/petstore/typescript-node/npm && mvn integration-test)
+  #(cd samples/client/petstore/typescript-rxjs/builds/with-npm-version && mvn integration-test)
+  #(cd samples/client/petstore/typescript-axios/builds/with-npm-version && mvn integration-test)
+  #(cd samples/client/petstore/typescript-axios/tests/default && mvn integration-test)
+  #(cd samples/client/petstore/typescript-axios/tests/with-complex-headers && mvn integration-test)
 
 else
   echo "Running node $NODE_INDEX ..."
   java -version
 
-  (cd samples/client/petstore/scala-akka && mvn integration-test)
-  (cd samples/client/petstore/scala-sttp && mvn integration-test)
-  (cd samples/client/petstore/scala-sttp-circe && mvn integration-test)
-  (cd samples/client/petstore/scala-sttp4 && mvn integration-test)
-  (cd samples/client/petstore/clojure && mvn integration-test)
-  (cd samples/client/petstore/java/jersey2-java8 && mvn integration-test)
-  (cd samples/openapi3/client/petstore/java/jersey2-java8 && mvn integration-test)
-  (cd samples/client/petstore/java/jersey3 && mvn integration-test)
-  (cd samples/client/petstore/java/jersey3-oneOf && mvn integration-test)
-  (cd samples/client/others/java/okhttp-gson-streaming && mvn integration-test)
-  (cd samples/client/petstore/java/okhttp-gson && mvn integration-test)
-  (cd samples/client/petstore/java/okhttp-gson-3.1 && mvn integration-test)
-  (cd samples/client/petstore/java/okhttp-gson-dynamicOperations && mvn integration-test)
-  (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

README.md

@@ -15,10 +15,8 @@
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.16.0`):
-[![Build Status](https://api.travis-ci.com/OpenAPITools/openapi-generator.svg?branch=master&status=passed)](https://app.travis-ci.com/github/OpenAPITools/openapi-generator/builds)
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.17.0`):
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
-[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator)
 [![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/master?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67)
 
 </div>
@@ -150,8 +148,8 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 7.16.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.16.0-SNAPSHOT/) | 22.09.2025   | Minor release with breaking changes (with fallback) |
-| [7.15.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.15.0) (latest stable release)                                                    | 22.08.2025   | Minor release with breaking changes (with fallback) |
+| 7.17.0 (upcoming minor release) [SNAPSHOT](https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-to-test-with-the-latest-master-of-openapi-generator) | 24.10.2025   | Minor release with breaking changes (with fallback) |
+| [7.16.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.16.0) (latest stable release)                                                    | 28.09.2025   | Minor release with breaking changes (with fallback) |
 | [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)                                                    | 11.05.2023   | Minor release with breaking changes (with fallback) |
 | [5.4.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.4.0)                                                    | 31.01.2022   | Minor release with breaking changes (with fallback) |
 | [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |
@@ -214,16 +212,16 @@ See the different versions of the [openapi-generator-cli](https://search.maven.o
 <!-- RELEASE_VERSION -->
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 11 runtime at a minimum):
 
-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.15.0/openapi-generator-cli-7.15.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.15.0/openapi-generator-cli-7.15.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar -O openapi-generator-cli.jar
 ```
 
 For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
 ```
-Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.15.0/openapi-generator-cli-7.15.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -458,7 +456,7 @@ openapi-generator-cli version
 To use a specific version of "openapi-generator-cli"
 
 ```sh
-openapi-generator-cli version-manager set 7.15.0
+openapi-generator-cli version-manager set 7.16.0
 ```
 
 Or install it as dev-dependency:
@@ -482,7 +480,7 @@ pip install openapi-generator-cli
 
 To install a specific version
 ```
-pip install openapi-generator-cli==7.15.0
+pip install openapi-generator-cli==7.16.0
 ```
 
 You can also install with [jdk4py](https://github.com/activeviam/jdk4py) instead of java binary. (python>=3.10 is required)
@@ -508,7 +506,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat
 (if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`)
 
 <!-- RELEASE_VERSION -->
-You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.15.0/openapi-generator-cli-7.15.0.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar)
 <!-- /RELEASE_VERSION -->
 
 To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`

appveyor.yml

@@ -1,119 +0,0 @@
-version: '{branch}-{build}'
-image: Visual Studio 2022
-hosts:
-  petstore.swagger.io: 127.0.0.1
-install:
-  - cmd: SET PATH=C:\maven\apache-maven-3.8.3\bin;C:\gradle\gradle-7.6\bin;%JAVA_HOME%\bin;%PATH%
-  - cmd: SET MAVEN_OPTS=-Xmx4g
-  - cmd: SET JAVA_OPTS=-Xmx4g
-  - cmd: SET M2_HOME=C:\maven\apache-maven-3.8.3
-  - cmd: java -version
-  - cmd: dir/w
-  - cmd: docker pull swaggerapi/petstore
-  - cmd: docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore 
-  - ps: Start-Sleep -s 120
-  - ps: $PSVersionTable.PSVersion
-  - ps: Install-Module -Name Pester -Force -Scope CurrentUser -SkipPublisherCheck
-build_script:
-  - dotnet --info
-  # build C# aspnetcore 5.0 server
-  #- dotnet build samples\server\petstore\aspnetcore-5.0\Org.OpenAPITools.sln
-  ## build C# aspnetcore 3.1 server
-  #- dotnet build samples\server\petstore\aspnetcore-3.1\Org.OpenAPITools.sln
-  ## build C# aspnetcore 3.0 server
-  #- dotnet build samples\server\petstore\aspnetcore-3.0\Org.OpenAPITools.sln
-  ## build C# aspnetcore 2.2 server
-  #- dotnet build samples\server\petstore\aspnetcore\Org.OpenAPITools.sln
-  ## build C# API client (multiple frameworks)
-  #- dotnet build samples\client\petstore\csharp\OpenAPIClientCoreAndNet47\Org.OpenAPITools.sln
-  ## build C# API client (httpclient)
-  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-httpclient\Org.OpenAPITools.sln
-  ## build C# API client (generichost)
-  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-generichost-netstandard2.0\Org.OpenAPITools.sln
-  ## build C# API client (netcore)
-  #- dotnet build samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln
-  #- dotnet build samples\client\petstore\csharp\OpenAPIClientCore\Org.OpenAPITools.sln
-  ## build C# API client (.net framework 4.7)
-  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-net47\Org.OpenAPITools.sln
-  ## build C# API client (.net framework 4.8)
-  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-net48\Org.OpenAPITools.sln
-  ## build C# API client (.net 5.0)
-  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-net5.0\Org.OpenAPITools.sln
-  ## build C# API client (.net 5.0 with ConditionalSerialization)
-  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln
-
-test_script:
-  - dotnet test samples\client\petstore\csharp\generichost\latest\ComposedEnum\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\latest\InlineEnumAnyOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\latest\Tags\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\latest\HelloWorld\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\latest\OneOfList\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-
-  - dotnet test samples\client\petstore\csharp\generichost\net9\AllOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net9\AnyOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net9\AnyOfNoCompare\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net9\FormModels\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  # - dotnet test samples\client\petstore\csharp\generichost\net9\ManualSourceGenerationTests\ManualTests.Latest.UseSourceGeneration\ManualTests.Latest.UseSourceGeneration.csproj
-  # - dotnet test samples\client\petstore\csharp\generichost\net9\ManualPetstoreTests\OpenAPIClient-generichost-manual-tests\OpenAPIClient-generichost-manual-tests.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net9\NullReferenceTypes\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net9\OneOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net9\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net9\SourceGeneration\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net9\UseDateTimeForDate\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-
-  - dotnet test samples\client\petstore\csharp\generichost\net8\AllOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\AnyOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\AnyOfNoCompare\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\FormModels\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\ManualSourceGenerationTests\ManualTests.Latest.UseSourceGeneration\ManualTests.Latest.UseSourceGeneration.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\ManualPetstoreTests\OpenAPIClient-generichost-manual-tests\OpenAPIClient-generichost-manual-tests.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\NullReferenceTypes\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\OneOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\SourceGeneration\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\UseDateTimeForDate\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-
-  - dotnet test samples\client\petstore\csharp\generichost\standard2.0\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-
-  - dotnet test samples\client\petstore\csharp\generichost\net4.8\AllOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net4.8\AnyOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net4.8\AnyOfNoCompare\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net4.8\FormModels\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net4.8\OneOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net4.8\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net4.8\UseDateTimeForDate\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-
-  - dotnet test samples\client\petstore\csharp\generichost\net4.7\AllOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net4.7\AnyOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net4.7\AnyOfNoCompare\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net4.7\FormModels\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net4.7\OneOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net4.7\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net4.7\UseDateTimeForDate\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-
-  - dotnet test samples\client\petstore\csharp\httpclient\standard2.0\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-
-  - dotnet test samples\client\petstore\csharp\restsharp\net4.7\MultipleFrameworks\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\net4.7\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\net4.8\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\net8\ParameterMappings\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\net8\EnumMappings\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\net8\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\net8\UseDateTimeForDate\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\standard2.0\ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\restsharp\standard2.0\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-
-### TODO: Execute all generators via powershell or other
-  # generate all petstore clients
-  # - .\bin\windows\run-all-petstore.cmd
-  # generate all petstore clients (openapi3)
-  # - .\bin\openapi3\windows\run-all-petstore.cmd
-
-  # test ps petstore
-  - ps: |
-      cd samples\client\petstore\powershell\
-      .\CIRunTest.ps1
-cache:
-  - C:\maven\
-  - C:\gradle\
-  - C:\Users\appveyor\.m2

bin/configs/csharp-httpclient-net9-nonPublicApi.yaml

@@ -0,0 +1,14 @@
+# for .net standard httpclient
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/httpclient/net9/Petstore-nonPublicApi
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-addpet-only.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+library: httpclient
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  useOneOfDiscriminatorLookup: true
+  targetFramework: net9.0
+  equatable: true
+  nonPublicApi: true

bin/configs/csharp-restsharp-netstandard2.0.yaml

@@ -2,7 +2,7 @@
 generatorName: csharp
 library: restsharp
 outputDir: samples/client/petstore/csharp/restsharp/standard2.0/Petstore
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types.yaml
+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}'

bin/configs/go-petstore-oas2.yaml

@@ -1,6 +1,6 @@
 generatorName: go
 outputDir: samples/client/petstore/go/go-petstore
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-localhost.yaml
 templateDir: modules/openapi-generator/src/main/resources/go
 additionalProperties:
   packageName: petstore

bin/configs/go-server-optional-body.yaml

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

bin/configs/jaxrs-cxf-client-swagger2.yaml

@@ -0,0 +1,8 @@
+generatorName: jaxrs-cxf-client
+outputDir: samples/client/petstore/jaxrs-cxf-client-swagger2
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf
+additionalProperties:
+  artifactId: jaxrs-cxf-petstore-swagger2
+  documentationProvider: swagger2
+  annotationLibrary: swagger2

bin/configs/jaxrs-spec-withxml.yaml

@@ -0,0 +1,10 @@
+generatorName: jaxrs-spec
+outputDir: samples/server/petstore/jaxrs-spec-withxml/
+inputSpec: modules/openapi-generator/src/test/resources/3_0/jaxrs-spec/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
+additionalProperties:
+  artifactId: jaxrs-spec-withxml-petstore-server
+  serializableModel: "true"
+  hideGenerationTimestamp: "true"
+  generateBuilders: "true"
+  withXml: true

bin/configs/kotlin-spring-boot-additionalproperties.yaml

@@ -0,0 +1,14 @@
+generatorName: kotlin-spring
+outputDir: samples/server/petstore/kotlin-springboot-additionalproperties
+library: spring-boot
+inputSpec: samples/server/petstore/kotlin-springboot-additionalproperties/src/main/resources/openapi.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
+additionalProperties:
+  documentationProvider: none
+  annotationLibrary: none
+  useSwaggerUI: "false"
+  serviceImplementation: "true"
+  serializableModel: "true"
+  beanValidations: "true"
+  useSpringBoot3: "true"
+  requestMappingMode: api_interface

bin/configs/python-httpx.yaml

@@ -0,0 +1,15 @@
+generatorName: python
+outputDir: samples/openapi3/client/petstore/python-httpx
+inputSpec: modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/python
+library: httpx
+additionalProperties:
+  packageName: petstore_api
+  mapNumberTo: float
+  poetry1: true
+nameMappings:
+  _type: underscore_type
+  type_: type_with_underscore
+modelNameMappings:
+  # The OpenAPI spec ApiResponse conflicts with the internal ApiResponse
+  ApiResponse: ModelApiResponse

bin/configs/ruby-faraday.yaml

@@ -1,7 +1,7 @@
 generatorName: ruby
 outputDir: samples/client/petstore/ruby-faraday
 library: faraday
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/ruby/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/ruby-client
 additionalProperties:
   gemVersion: 1.0.0

bin/configs/spring-boot-oneof-interface.yaml

@@ -0,0 +1,12 @@
+generatorName: spring
+outputDir: samples/openapi3/server/petstore/spring-boot-oneof-interface
+inputSpec: modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: springboot-oneof
+  snapshotVersion: "true"
+  hideGenerationTimestamp: "true"
+  useOneOfInterfaces: "true"
+  useDeductionForOneOfInterfaces: "true"

bin/configs/typescript-angular-v19-provided-in-root.yaml

@@ -0,0 +1,9 @@
+generatorName: typescript-angular
+outputDir: samples/client/petstore/typescript-angular-v19-provided-in-root/builds/default
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+additionalProperties:
+  ngVersion: 19.0.0
+  supportsES6: true
+enumNameMappings:
+  delivered: SHIPPED

bin/configs/typescript-angular-v20-provided-in-root.yaml

@@ -0,0 +1,9 @@
+generatorName: typescript-angular
+outputDir: samples/client/petstore/typescript-angular-v20-provided-in-root/builds/default
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+additionalProperties:
+  ngVersion: 20.0.0
+  supportsES6: true
+enumNameMappings:
+  delivered: SHIPPED

bin/configs/typescript-fetch-infinite-recursion-issue.yaml

@@ -0,0 +1,7 @@
+generatorName: typescript-fetch
+outputDir: samples/client/others/typescript-fetch/infinite-recursion-issue
+inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-fetch/infinite-recursion-issue.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+additionalProperties:
+  enumPropertyNaming: "original"
+  enumUnknownDefaultCase: true

bin/configs/unmaintained/scala-lagom-server.yaml

@@ -1,6 +0,0 @@
-systemProperties:
-  skipFormModel: "true"
-generatorName: scala-lagom-server
-outputDir: samples/server/petstore/scala-lagom-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-lagom-server

bin/utils/dart-keywords/README.md

@@ -5,11 +5,11 @@ Running `./save_dart_keywords.sh` from this directory will generate `dart-keywor
 
 ## When should the keywords be generated?
 
-`save_dart_keywords.sh` should be run when a new version of Dart is release to update the keywords file.
+`save_dart_keywords.sh` should be run when a new version of Dart is released to update the keywords file.
 
 The last Dart version that was used to generate the keywords can be found in `dart-version.txt`.
 
-## What does the shellscript do? 
+## What does the shell script do? 
 
 1. run the dart app 
     - `dart run save-dart-keywords.dart`

bin/utils/test_file_list.yaml

@@ -61,4 +61,4 @@
 - filename: "samples/server/petstore/rust-axum/output/rust-axum-oneof/tests/oneof_with_discriminator.rs"
   sha256: 2d4f5a069fdcb3057bb078d5e75b3de63cd477b97725e457079df24bd2c30600
 - filename: "samples/server/petstore/rust-axum/output/openapi-v3/tests/oneof_untagged.rs"
-  sha256: e72fbf81a9849dc7abb7e2169f2fc355c8b1cf991c0e2ffc083126abd9e966e7
+  sha256: 1d3fb01f65e98290b1d3eece28014c7d3e3f2fdf18e7110249d3c591cc4642ab

docs/debugging.md

@@ -5,7 +5,7 @@ title: Debugging
 
 ## Generation
 
-As a user there may be times when generated outputs don't match your expectations it's unclear why. The CLI supports a `--dry-run` option which may be used to inspect the anticipated file operations without making changes to the file system.
+As a user there may be times when generated outputs don't match your expectations and it's unclear why. The CLI supports a `--dry-run` option which may be used to inspect the anticipated file operations without making changes to the file system.
 
 Suppose you generate using the `--minimal-update` option, and you notice on subsequent generations of a client that no files have changed. This is by design.
 

docs/generators.md

@@ -151,7 +151,7 @@ The following generators are available:
 * [scala-cask](generators/scala-cask.md)  
 * [scala-finch](generators/scala-finch.md)  
 * [scala-http4s-server](generators/scala-http4s-server.md)  
-* [scala-lagom-server](generators/scala-lagom-server.md)  
+* [scala-lagom-server-deprecated (deprecated)](generators/scala-lagom-server-deprecated.md)  
 * [scala-play-server](generators/scala-play-server.md)  
 * [scalatra](generators/scalatra.md)  
 * [spring](generators/spring.md)  

docs/generators/java-camel.md

@@ -95,10 +95,12 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
 |sourceFolder|source folder for generated code| |src/main/java|
+|springApiVersion|Value for 'version' attribute in @RequestMapping (for Spring 7 and above).| |null|
 |testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
 |title|server title name or client service name| |OpenAPI Spring|
 |unhandledException|Declare operation methods to throw a generic exception and allow unhandled exceptions (useful for Spring `@ControllerAdvice` directives).| |false|
 |useBeanValidation|Use BeanValidation API annotations| |true|
+|useDeductionForOneOfInterfaces|whether to use deduction for generated oneOf interfaces| |false|
 |useEnumCaseInsensitive|Use `equalsIgnoreCase` when String for enum comparison| |false|
 |useFeignClientContextId|Whether to generate Feign client with contextId parameter.| |true|
 |useFeignClientUrl|Whether to generate Feign client with url parameter.| |true|
@@ -131,6 +133,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |x-spring-paginated|Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.|OPERATION|false
 |x-version-param|Marker property that tells that this parameter would be used for endpoint versioning. Applicable for headers & query params. true/false|OPERATION_PARAMETER|null
 |x-pattern-message|Add this property whenever you need to customize the invalidation error message for the regex pattern of a variable|FIELD, OPERATION_PARAMETER|null
+|x-spring-api-version|Value for 'version' attribute in @RequestMapping (for Spring 7 and above).|OPERATION|null
 
 
 ## IMPORT MAPPING

docs/generators/jaxrs-cxf-client.md

@@ -22,6 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
 |additionalOneOfTypeAnnotations|Additional annotations for oneOf interfaces(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|annotationLibrary|Select the complementary documentation annotation library.|<dl><dt>**none**</dt><dd>Do not annotate Model and Api with complementary annotations.</dd><dt>**swagger1**</dt><dd>Annotate Model and Api using the Swagger Annotations 1.x library.</dd><dt>**swagger2**</dt><dd>Annotate Model and Api using the Swagger Annotations 2.x library.</dd></dl>|swagger1|
 |apiPackage|package for generated api classes| |org.openapitools.api|
 |artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
 |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-client|
@@ -39,6 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
+|documentationProvider|Select the OpenAPI documentation provider.|<dl><dt>**none**</dt><dd>Do not publish an OpenAPI specification.</dd><dt>**swagger1**</dt><dd>Generate an OpenAPI 2 (fka Swagger RESTful API Documentation Specification) specification using Swagger-Core 1.x.</dd><dt>**swagger2**</dt><dd>Generate an OpenAPI 3 specification using Swagger-Core 2.x.</dd></dl>|swagger1|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|

docs/generators/jaxrs-cxf-extended.md

@@ -23,6 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
 |additionalOneOfTypeAnnotations|Additional annotations for oneOf interfaces(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|annotationLibrary|Select the complementary documentation annotation library.|<dl><dt>**none**</dt><dd>Do not annotate Model and Api with complementary annotations.</dd><dt>**swagger1**</dt><dd>Annotate Model and Api using the Swagger Annotations 1.x library.</dd><dt>**swagger2**</dt><dd>Annotate Model and Api using the Swagger Annotations 2.x library.</dd></dl>|swagger1|
 |apiPackage|package for generated api classes| |org.openapitools.api|
 |artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
 |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-cxf-server|
@@ -40,6 +41,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
+|documentationProvider|Select the OpenAPI documentation provider.|<dl><dt>**none**</dt><dd>Do not publish an OpenAPI specification.</dd><dt>**swagger1**</dt><dd>Generate an OpenAPI 2 (fka Swagger RESTful API Documentation Specification) specification using Swagger-Core 1.x.</dd><dt>**swagger2**</dt><dd>Generate an OpenAPI 3 specification using Swagger-Core 2.x.</dd></dl>|swagger1|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|

docs/generators/jaxrs-cxf.md

@@ -23,6 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
 |additionalOneOfTypeAnnotations|Additional annotations for oneOf interfaces(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|annotationLibrary|Select the complementary documentation annotation library.|<dl><dt>**none**</dt><dd>Do not annotate Model and Api with complementary annotations.</dd><dt>**swagger1**</dt><dd>Annotate Model and Api using the Swagger Annotations 1.x library.</dd><dt>**swagger2**</dt><dd>Annotate Model and Api using the Swagger Annotations 2.x library.</dd></dl>|swagger1|
 |apiPackage|package for generated api classes| |org.openapitools.api|
 |artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
 |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-cxf-server|
@@ -40,6 +41,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
+|documentationProvider|Select the OpenAPI documentation provider.|<dl><dt>**none**</dt><dd>Do not publish an OpenAPI specification.</dd><dt>**swagger1**</dt><dd>Generate an OpenAPI 2 (fka Swagger RESTful API Documentation Specification) specification using Swagger-Core 1.x.</dd><dt>**swagger2**</dt><dd>Generate an OpenAPI 3 specification using Swagger-Core 2.x.</dd></dl>|swagger1|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumPropertyNaming|Naming convention for enum properties: 'MACRO_CASE', 'legacy' and 'original'| |MACRO_CASE|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|

docs/generators/postman.md

@@ -1,167 +0,0 @@
----
-title: Documentation for the postman Generator
----
-
-## METADATA
-
-| Property | Value | Notes |
-| -------- | ----- | ----- |
-| generator name | postman | pass this to the generate command after -g |
-| generator stability | BETA | |
-| generator type | DOCUMENTATION | |
-| generator default templating engine | mustache | |
-| helpTxt | Generates a postman JSON file | |
-
-## CONFIG OPTIONS
-These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.
-
-| Option | Description | Values | Default |
-| ------ | ----------- | ------ | ------- |
-|folderStrategy|whether to create folders according to the spec’s paths or tags| |null|
-|pathParamsAsVariables|whether to create Postman variables for path parameters| |false|
-|postmanGuid|whether to convert placeholders (i.e. {{UNIQUE_REFERENCE}}) into Postman formula {{$guid}}| |null|
-|postmanGuidPlaceholderName|name of the placeholder (i.e. {{UNIQUE_REFERENCE}}) to replace with Postman formula {{$guid}}| |null|
-|postmanIsoTimestamp|whether to convert placeholders (i.e. {{ISO_TIMESTAMP}}) into Postman formula {{$isoTimestamp}}| |null|
-|postmanIsoTimestampPlaceholderName|name of the placeholder (i.e. {{ISO_TIMESTAMP}}) to replace with Postman formula {{$isoTimestamp}}| |null|
-|postmanVariables|whether to convert placeholders (i.e. {{VAR_1}}) into Postman variables| |null|
-|requestParameterGeneration|whether to generate the request parameters based on the schema or the examples| |null|
-
-## IMPORT MAPPING
-
-| Type/Alias | Imports |
-| ---------- | ------- |
-
-
-## INSTANTIATION TYPES
-
-| Type/Alias | Instantiated By |
-| ---------- | --------------- |
-
-
-## LANGUAGE PRIMITIVES
-
-<ul class="column-ul">
-</ul>
-
-## RESERVED WORDS
-
-<ul class="column-ul">
-</ul>
-
-## FEATURE SET
-
-
-### Client Modification Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|BasePath|✗|ToolingExtension
-|Authorizations|✗|ToolingExtension
-|UserAgent|✗|ToolingExtension
-|MockServer|✗|ToolingExtension
-
-### Data Type Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Custom|✗|OAS2,OAS3
-|Int32|✓|OAS2,OAS3
-|Int64|✓|OAS2,OAS3
-|Float|✓|OAS2,OAS3
-|Double|✓|OAS2,OAS3
-|Decimal|✓|ToolingExtension
-|String|✓|OAS2,OAS3
-|Byte|✓|OAS2,OAS3
-|Binary|✓|OAS2,OAS3
-|Boolean|✓|OAS2,OAS3
-|Date|✓|OAS2,OAS3
-|DateTime|✓|OAS2,OAS3
-|Password|✓|OAS2,OAS3
-|File|✓|OAS2
-|Uuid|✗|
-|Array|✓|OAS2,OAS3
-|Null|✗|OAS3
-|AnyType|✗|OAS2,OAS3
-|Object|✓|OAS2,OAS3
-|Maps|✓|ToolingExtension
-|CollectionFormat|✓|OAS2
-|CollectionFormatMulti|✓|OAS2
-|Enum|✓|OAS2,OAS3
-|ArrayOfEnum|✓|ToolingExtension
-|ArrayOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfPrimitives|✓|ToolingExtension
-|ArrayOfCollectionOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfEnum|✓|ToolingExtension
-|MapOfEnum|✓|ToolingExtension
-|MapOfModel|✓|ToolingExtension
-|MapOfCollectionOfPrimitives|✓|ToolingExtension
-|MapOfCollectionOfModel|✓|ToolingExtension
-|MapOfCollectionOfEnum|✓|ToolingExtension
-
-### Documentation Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Readme|✗|ToolingExtension
-|Model|✓|ToolingExtension
-|Api|✓|ToolingExtension
-
-### Global Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Host|✓|OAS2,OAS3
-|BasePath|✓|OAS2,OAS3
-|Info|✓|OAS2,OAS3
-|Schemes|✗|OAS2,OAS3
-|PartialSchemes|✓|OAS2,OAS3
-|Consumes|✓|OAS2
-|Produces|✓|OAS2
-|ExternalDocumentation|✓|OAS2,OAS3
-|Examples|✓|OAS2,OAS3
-|XMLStructureDefinitions|✗|OAS2,OAS3
-|MultiServer|✗|OAS3
-|ParameterizedServer|✗|OAS3
-|ParameterStyling|✗|OAS3
-|Callbacks|✓|OAS3
-|LinkObjects|✗|OAS3
-
-### Parameter Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Path|✓|OAS2,OAS3
-|Query|✓|OAS2,OAS3
-|Header|✓|OAS2,OAS3
-|Body|✓|OAS2
-|FormUnencoded|✓|OAS2
-|FormMultipart|✓|OAS2
-|Cookie|✓|OAS3
-
-### Schema Support Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Simple|✓|OAS2,OAS3
-|Composite|✓|OAS2,OAS3
-|Polymorphism|✓|OAS2,OAS3
-|Union|✗|OAS3
-|allOf|✗|OAS2,OAS3
-|anyOf|✗|OAS3
-|oneOf|✗|OAS3
-|not|✗|OAS3
-
-### Security Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|BasicAuth|✓|OAS2,OAS3
-|ApiKey|✓|OAS2,OAS3
-|OpenIDConnect|✗|OAS3
-|BearerToken|✓|OAS3
-|OAuth2_Implicit|✓|OAS2,OAS3
-|OAuth2_Password|✓|OAS2,OAS3
-|OAuth2_ClientCredentials|✓|OAS2,OAS3
-|OAuth2_AuthorizationCode|✓|OAS2,OAS3
-|SignatureAuth|✗|OAS3
-
-### Wire Format Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|JSON|✓|OAS2,OAS3
-|XML|✓|OAS2,OAS3
-|PROTOBUF|✗|ToolingExtension
-|Custom|✗|OAS2,OAS3

docs/generators/python.md

@@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |generateSourceCodeOnly|Specifies that only a library source code is to be generated.| |false|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |lazyImports|Enable lazy imports.| |false|
-|library|library template (sub-template) to use: asyncio, tornado (deprecated), urllib3| |urllib3|
+|library|library template (sub-template) to use: asyncio, tornado (deprecated), urllib3, httpx| |urllib3|
 |mapNumberTo|Map number to Union[StrictFloat, StrictInt], StrictStr or float.| |Union[StrictFloat, StrictInt]|
 |packageName|python package name (convention: snake_case).| |openapi_client|
 |packageUrl|python package URL.| |null|

docs/generators/rust-axum.md

@@ -77,6 +77,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>dyn</li>
 <li>else</li>
 <li>enum</li>
+<li>errors</li>
 <li>extern</li>
 <li>false</li>
 <li>final</li>
@@ -207,8 +208,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |Composite|✓|OAS2,OAS3
 |Polymorphism|✗|OAS2,OAS3
 |Union|✗|OAS3
-|allOf|✗|OAS2,OAS3
-|anyOf|✗|OAS3
+|allOf|✓|OAS2,OAS3
+|anyOf|✓|OAS3
 |oneOf|✓|OAS3
 |not|✗|OAS3
 

docs/generators/rust.md

@@ -27,6 +27,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |packageName|Rust package name (convention: lowercase).| |openapi|
 |packageVersion|Rust package version.| |1.0.0|
 |preferUnsignedInt|Prefer unsigned integers where minimum value is >= 0| |false|
+|reqwestDefaultFeatures|Default features for the reqwest dependency (comma-separated). Use empty for no defaults. This option is for 'reqwest' and 'reqwest-trait' library only.| |native-tls|
 |supportAsync|If set, generate async function call instead. This option is for 'reqwest' library only| |true|
 |supportMiddleware|If set, add support for reqwest-middleware. This option is for 'reqwest' and 'reqwest-trait' library only| |false|
 |supportMultipleResponses|If set, return type wraps an enum of all possible 2xx schemas. This option is for 'reqwest' and 'reqwest-trait' library only| |false|

docs/generators/scala-lagom-server-deprecated.md

@@ -1,17 +1,17 @@
 ---
-title: Documentation for the scala-lagom-server Generator
+title: Documentation for the scala-lagom-server-deprecated Generator
 ---
 
 ## METADATA
 
 | Property | Value | Notes |
 | -------- | ----- | ----- |
-| generator name | scala-lagom-server | pass this to the generate command after -g |
-| generator stability | STABLE | |
+| generator name | scala-lagom-server-deprecated | pass this to the generate command after -g |
+| generator stability | DEPRECATED | |
 | generator type | SERVER | |
 | generator language | Scala | |
 | generator default templating engine | mustache | |
-| helpTxt | Generates a Lagom API server (Beta) in scala | |
+| helpTxt | Generates a Lagom API server (Beta) in scala. IMPORTANT: this generator has been deprecated | |
 
 ## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

docs/generators/spring.md

@@ -88,10 +88,12 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
 |sourceFolder|source folder for generated code| |src/main/java|
+|springApiVersion|Value for 'version' attribute in @RequestMapping (for Spring 7 and above).| |null|
 |testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
 |title|server title name or client service name| |OpenAPI Spring|
 |unhandledException|Declare operation methods to throw a generic exception and allow unhandled exceptions (useful for Spring `@ControllerAdvice` directives).| |false|
 |useBeanValidation|Use BeanValidation API annotations| |true|
+|useDeductionForOneOfInterfaces|whether to use deduction for generated oneOf interfaces| |false|
 |useEnumCaseInsensitive|Use `equalsIgnoreCase` when String for enum comparison| |false|
 |useFeignClientContextId|Whether to generate Feign client with contextId parameter.| |true|
 |useFeignClientUrl|Whether to generate Feign client with url parameter.| |true|
@@ -124,6 +126,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |x-spring-paginated|Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.|OPERATION|false
 |x-version-param|Marker property that tells that this parameter would be used for endpoint versioning. Applicable for headers & query params. true/false|OPERATION_PARAMETER|null
 |x-pattern-message|Add this property whenever you need to customize the invalidation error message for the regex pattern of a variable|FIELD, OPERATION_PARAMETER|null
+|x-spring-api-version|Value for 'version' attribute in @RequestMapping (for Spring 7 and above).|OPERATION|null
 
 
 ## IMPORT MAPPING

docs/installation.md

@@ -22,7 +22,7 @@ npm install @openapitools/openapi-generator-cli -g
 To install a specific version of the tool, pass the version during installation:
 <!-- RELEASE_VERSION -->
 ```bash
-openapi-generator-cli version-manager set 7.15.0
+openapi-generator-cli version-manager set 7.16.0
 ```
 <!-- /RELEASE_VERSION -->
 To install the tool as a dev dependency in your current project:
@@ -119,18 +119,18 @@ docker run --rm \
 <!-- RELEASE_VERSION -->
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 11 runtime at a minimum):
 
-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.15.0/openapi-generator-cli-7.15.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar`
 
 For **Mac/Linux** users:
 
 ```bash
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.15.0/openapi-generator-cli-7.15.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar -O openapi-generator-cli.jar
 ```
 
 For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
 
 ```powershell
-Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.15.0/openapi-generator-cli-7.15.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar
 ```
 <!-- /RELEASE_VERSION -->
 

docs/plugins.md

@@ -16,7 +16,7 @@ Add to your `build->plugins` section (default phase is `generate-sources` phase)
 <plugin>
     <groupId>org.openapitools</groupId>
     <artifactId>openapi-generator-maven-plugin</artifactId>
-    <version>7.15.0</version>
+    <version>7.16.0</version>
     <executions>
         <execution>
             <goals>

modules/openapi-generator-cli/pom.xml

@@ -4,7 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.16.0-SNAPSHOT</version>
+        <version>7.17.0-SNAPSHOT</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

modules/openapi-generator-core/pom.xml

@@ -6,7 +6,7 @@
     <artifactId>openapi-generator-project</artifactId>
     <groupId>org.openapitools</groupId>
     <!-- RELEASE_VERSION -->
-    <version>7.16.0-SNAPSHOT</version>
+    <version>7.17.0-SNAPSHOT</version>
     <!-- /RELEASE_VERSION -->
     <relativePath>../../pom.xml</relativePath>
   </parent>

modules/openapi-generator-gradle-plugin/README.adoc

@@ -97,7 +97,7 @@ task validateGoodSpec(type: org.openapitools.generator.gradle.plugin.tasks.Valid
 [source,group]
 ----
 plugins {
-  id "org.openapi.generator" version "7.15.0"
+  id "org.openapi.generator" version "7.16.0"
 }
 ----
 
@@ -113,7 +113,7 @@ buildscript {
     // url "https://plugins.gradle.org/m2/"
   }
   dependencies {
-    classpath "org.openapitools:openapi-generator-gradle-plugin:7.15.0"
+    classpath "org.openapitools:openapi-generator-gradle-plugin:7.16.0"
   }
 }
 
@@ -759,7 +759,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath('org.openapitools:openapi-generator-gradle-plugin:7.15.0') {
+        classpath('org.openapitools:openapi-generator-gradle-plugin:7.16.0') {
             exclude group: 'com.google.guava'
         }
     }

modules/openapi-generator-gradle-plugin/gradle.properties

@@ -1,5 +1,5 @@
 # RELEASE_VERSION
-openApiGeneratorVersion=7.16.0-SNAPSHOT
+openApiGeneratorVersion=7.17.0-SNAPSHOT
 # /RELEASE_VERSION
 
 # BEGIN placeholders

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

@@ -4,7 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.16.0-SNAPSHOT</version>
+        <version>7.17.0-SNAPSHOT</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

modules/openapi-generator-gradle-plugin/samples/local-spec/README.md

@@ -19,5 +19,5 @@ gradle generateGoWithInvalidSpec    # expected outcome: BUILD FAILED
 The samples can be tested against other versions of the plugin using the `openApiGeneratorVersion` property. For example:
 
 ```bash
-gradle -PopenApiGeneratorVersion=7.15.0 openApiValidate
+gradle -PopenApiGeneratorVersion=7.16.0 openApiValidate
 ```

modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties

@@ -1,3 +1,3 @@
 # RELEASE_VERSION
-openApiGeneratorVersion=7.16.0-SNAPSHOT
+openApiGeneratorVersion=7.17.0-SNAPSHOT
 # /RELEASE_VERSION

modules/openapi-generator-maven-plugin/README.md

@@ -12,7 +12,7 @@ Add to your `build->plugins` section (default phase is `generate-sources` phase)
     <groupId>org.openapitools</groupId>
     <artifactId>openapi-generator-maven-plugin</artifactId>
     <!-- RELEASE_VERSION -->
-    <version>7.15.0</version>
+    <version>7.16.0</version>
     <!-- /RELEASE_VERSION -->
     <executions>
         <execution>

modules/openapi-generator-maven-plugin/examples/java-client.xml

@@ -13,7 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.16.0-SNAPSHOT</version>
+                <version>7.17.0-SNAPSHOT</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>
@@ -217,9 +217,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>2.2.16</swagger-annotations-version>
         <jersey-version>2.35</jersey-version>
-        <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>
+        <jackson-version>2.19.2</jackson-version>
+        <jackson-databind-version>2.19.2</jackson-databind-version>
+        <jackson-databind-nullable-version>0.2.7</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         <junit-version>4.13.2</junit-version>
         <scribejava-apis-version>8.3.3</scribejava-apis-version>

modules/openapi-generator-maven-plugin/examples/kotlin.xml

@@ -15,7 +15,7 @@
 				<groupId>org.openapitools</groupId>
 				<artifactId>openapi-generator-maven-plugin</artifactId>
 				<!-- RELEASE_VERSION -->
-				<version>7.16.0-SNAPSHOT</version>
+				<version>7.17.0-SNAPSHOT</version>
 				<!-- /RELEASE_VERSION -->
 				<executions>
 					<execution>
@@ -232,8 +232,8 @@
 	<properties>
 		<swagger-annotations-version>1.5.8</swagger-annotations-version>
 		<jersey-version>2.27</jersey-version>
-		<jackson-version>2.15.2</jackson-version>
-		<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
+		<jackson-version>2.19.2</jackson-version>
+		<jackson-databind-nullable-version>0.2.7</jackson-databind-nullable-version>
 		<jodatime-version>2.7</jodatime-version>
 		<maven-plugin-version>1.0.0</maven-plugin-version>
 		<junit-version>4.13.2</junit-version>

modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml

@@ -19,7 +19,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.16.0-SNAPSHOT</version>
+                <version>7.17.0-SNAPSHOT</version>
                 <!-- /RELEASE_VERSION -->
                 <dependencies>
                     <dependency>

modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml

@@ -15,8 +15,8 @@
     <properties>
         <swagger-annotations-version>1.5.8</swagger-annotations-version>
         <jersey-version>2.35</jersey-version>
-        <jackson-version>2.17.1</jackson-version>
-        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <jackson-version>2.19.2</jackson-version>
+        <jackson-databind-nullable-version>0.2.7</jackson-databind-nullable-version>
         <jodatime-version>2.7</jodatime-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>5.10.2</junit-version>

modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml

@@ -13,7 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.16.0-SNAPSHOT</version>
+                <version>7.17.0-SNAPSHOT</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>

modules/openapi-generator-maven-plugin/examples/non-java.xml

@@ -13,7 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.16.0-SNAPSHOT</version>
+                <version>7.17.0-SNAPSHOT</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>

modules/openapi-generator-maven-plugin/examples/spring.xml

@@ -20,7 +20,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.16.0-SNAPSHOT</version>
+                <version>7.17.0-SNAPSHOT</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.6</version>
+            <version>0.2.7</version>
         </dependency>
         <!-- Bean Validation API support -->
         <dependency>

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

@@ -5,7 +5,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.16.0-SNAPSHOT</version>
+        <version>7.17.0-SNAPSHOT</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

modules/openapi-generator-online/pom.xml

@@ -4,7 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.16.0-SNAPSHOT</version>
+        <version>7.17.0-SNAPSHOT</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

modules/openapi-generator/pom.xml

@@ -4,7 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.16.0-SNAPSHOT</version>
+        <version>7.17.0-SNAPSHOT</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -298,7 +298,7 @@
         <dependency>
             <groupId>com.github.jknack</groupId>
             <artifactId>handlebars-jackson2</artifactId>
-            <version>${handlebars-jackson2.version}</version>
+            <version>${handlebars-java.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

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

@@ -456,4 +456,31 @@ public class CodegenConstants {
     public static final String USE_DEFAULT_VALUES_FOR_REQUIRED_VARS = "useDefaultValuesForRequiredVars";
 
     public static final String DEFAULT_TO_EMPTY_CONTAINER = "defaultToEmptyContainer";
+
+    // Vendor extensions
+    public static final String X_INTERNAL = "x-internal";
+    public static final String X_PARENT = "x-parent";
+    public static final String X_COMPOSED_DATA_TYPE = "x-composed-data-type";
+    public static final String X_BASE_NAME = "x-base-name";
+    public static final String X_IS_VALUE_TYPE = "x-is-value-type";
+    public static final String X_IS_REFERENCE_TYPE = "x-is-reference-type";
+    public static final String X_IS_NULLABLE_TYPE = "x-is-nullable-type";
+    public static final String X_IS_BASE_OR_NEW_DISCRIMINATOR = "x-is-base-or-new-discriminator";
+    public static final String X_ENUM_BYTE = "x-enum-byte";
+    public static final String X_HTTP_STATUS = "x-http-status";
+    public static final String X_HTTP_STATUSES_WITH_RETURN = "x-http-statuses-with-return";
+    public static final String X_SET_COOKIE = "x-set-cookie";
+    public static final String X_DUPLICATES = "x-duplicates";
+    public static final String X_HTTP_STATUS_IS_DEFAULT = "x-http-status-is-default";
+    public static final String X_ONLY_DEFAULT = "x-only-default";
+    public static final String X_HTTP_STATUS_RANGE = "x-http-status-range";
+    public static final String X_NOT_NULLABLE_REFERENCE_TYPES = "x-not-nullable-reference-types";
+    public static final String X_HAS_NOT_NULLABLE_REFERENCE_TYPES = "x-has-not-nullable-reference-types";
+    public static final String X_NULLABLE_VALUE_TYPE = "x-nullable-value-type";
+    public static final String X_NULLABLE_TYPE = "x-nullable-type";
+    public static final String X_CSHARP_VALUE_TYPE = "x-csharp-value-type";
+    public static final String X_REGEX = "x-regex";
+    public static final String X_MODIFIERS = "x-modifiers";
+    public static final String X_MODIFIER_PREFIX = "x-modifier-";
+    public static final String X_MODEL_IS_MUTABLE = "x-model-is-mutable";
 }

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

@@ -115,6 +115,15 @@ public class CodegenOperation {
         return nonEmpty(bodyParams);
     }
 
+    /**
+     * Check if there's at least one optional body parameter
+     *
+     * @return true if optional body parameter exists, false otherwise
+     */
+    public boolean getHasOptionalBodyParam() {
+        return nonEmpty(bodyParams) && nonEmpty(optionalParams) && bodyParams.stream().anyMatch(optionalParams::contains);
+    }
+
     /**
      * Check if there's at least one query parameter
      *

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

@@ -88,8 +88,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.openapitools.codegen.CodegenConstants.DEFAULT_TO_EMPTY_CONTAINER;
-import static org.openapitools.codegen.CodegenConstants.UNSUPPORTED_V310_SPEC_MSG;
+import static org.openapitools.codegen.CodegenConstants.*;
 import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
 import static org.openapitools.codegen.utils.OnceLogger.once;
 import static org.openapitools.codegen.utils.StringUtils.*;
@@ -5197,7 +5196,7 @@ public class DefaultCodegen implements CodegenConfig {
                         String method = p.getKey();
                         Operation op = p.getValue();
 
-                        if (op.getExtensions() != null && Boolean.TRUE.equals(op.getExtensions().get("x-internal"))) {
+                        if (op.getExtensions() != null && Boolean.TRUE.equals(op.getExtensions().get(X_INTERNAL))) {
                             // skip operation if x-internal sets to true
                             LOGGER.info("Operation ({} {} - {}) not generated since x-internal is set to true",
                                     method, expression, op.getOperationId());

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

@@ -61,6 +61,7 @@ import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static org.apache.commons.lang3.StringUtils.removeStart;
+import static org.openapitools.codegen.CodegenConstants.X_INTERNAL;
 import static org.openapitools.codegen.utils.OnceLogger.once;
 
 @SuppressWarnings("rawtypes")
@@ -486,7 +487,7 @@ public class DefaultGenerator implements Generator {
 
                 Schema schema = ModelUtils.getSchemas(this.openAPI).get(name);
 
-                if (schema.getExtensions() != null && Boolean.TRUE.equals(schema.getExtensions().get("x-internal"))) {
+                if (schema.getExtensions() != null && Boolean.TRUE.equals(schema.getExtensions().get(X_INTERNAL))) {
                     LOGGER.info("Model {} not generated since x-internal is set to true", name);
                     continue;
                 } else if (ModelUtils.isFreeFormObject(schema, openAPI)) { // check to see if it's a free-form object
@@ -1564,7 +1565,7 @@ public class DefaultGenerator implements Generator {
         final List<SecurityRequirement> globalSecurities = openAPI.getSecurity();
         for (Tag tag : tags) {
             try {
-                if (operation.getExtensions() != null && Boolean.TRUE.equals(operation.getExtensions().get("x-internal"))) {
+                if (operation.getExtensions() != null && Boolean.TRUE.equals(operation.getExtensions().get(X_INTERNAL))) {
                     // skip operation if x-internal sets to true
                     LOGGER.info("Operation ({} {} - {}) not generated since x-internal is set to true",
                             httpMethod, resourcePath, operation.getOperationId());

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

@@ -37,6 +37,8 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static org.openapitools.codegen.CodegenConstants.X_INTERNAL;
+import static org.openapitools.codegen.CodegenConstants.X_PARENT;
 import static org.openapitools.codegen.utils.ModelUtils.simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema;
 import static org.openapitools.codegen.utils.StringUtils.getUniqueString;
 
@@ -127,7 +129,6 @@ public class OpenAPINormalizer {
 
     // when set to true, remove x-internal: true from models, operations
     final String REMOVE_X_INTERNAL = "REMOVE_X_INTERNAL";
-    final String X_INTERNAL = "x-internal";
     boolean removeXInternal;
 
     // when set (e.g. operationId:getPetById|addPet), filter out (or remove) everything else
@@ -431,17 +432,17 @@ public class OpenAPINormalizer {
             for (Operation operation : operations) {
                 if (operationIdFilters.size() > 0) {
                     if (operationIdFilters.contains(operation.getOperationId())) {
-                        operation.addExtension("x-internal", false);
+                        operation.addExtension(X_INTERNAL, false);
                     } else {
                         LOGGER.info("operation `{}` marked as internal only (x-internal: true) by the operationId FILTER", operation.getOperationId());
-                        operation.addExtension("x-internal", true);
+                        operation.addExtension(X_INTERNAL, true);
                     }
                 } else if (!tagFilters.isEmpty()) {
                     if (operation.getTags().stream().anyMatch(tagFilters::contains)) {
-                        operation.addExtension("x-internal", false);
+                        operation.addExtension(X_INTERNAL, false);
                     } else {
                         LOGGER.info("operation `{}` marked as internal only (x-internal: true) by the tag FILTER", operation.getOperationId());
-                        operation.addExtension("x-internal", true);
+                        operation.addExtension(X_INTERNAL, true);
                     }
                 }
 
@@ -723,15 +724,17 @@ public class OpenAPINormalizer {
         if (skipNormalization(schema, visitedSchemas)) {
             return schema;
         }
+
+        if (ModelUtils.isNullTypeSchema(openAPI, schema)) {
+            return schema;
+        }
+
         markSchemaAsVisited(schema, visitedSchemas);
 
         if (ModelUtils.isArraySchema(schema)) { // array
             Schema result = normalizeArraySchema(schema);
             normalizeSchema(result.getItems(), visitedSchemas);
             return result;
-        } else if (schema.getAdditionalProperties() instanceof Schema) { // map
-            normalizeMapSchema(schema);
-            normalizeSchema((Schema) schema.getAdditionalProperties(), visitedSchemas);
         } else if (ModelUtils.isOneOf(schema)) { // oneOf
             return normalizeOneOf(schema, visitedSchemas);
         } else if (ModelUtils.isAnyOf(schema)) { // anyOf
@@ -768,6 +771,9 @@ public class OpenAPINormalizer {
             return schema;
         } else if (schema.getProperties() != null && !schema.getProperties().isEmpty()) {
             normalizeProperties(schema.getProperties(), visitedSchemas);
+        } else if (schema.getAdditionalProperties() instanceof Schema) { // map
+            normalizeMapSchema(schema);
+            normalizeSchema((Schema) schema.getAdditionalProperties(), visitedSchemas);
         } else if (schema instanceof BooleanSchema) {
             normalizeBooleanSchema(schema, visitedSchemas);
         } else if (schema instanceof IntegerSchema) {
@@ -849,6 +855,20 @@ public class OpenAPINormalizer {
         }
         for (Map.Entry<String, Schema> propertiesEntry : properties.entrySet()) {
             Schema property = propertiesEntry.getValue();
+            
+            // remove x-internal if needed (same logic as normalizeComponentsSchemas)
+            if (property.getExtensions() != null && getRule(REMOVE_X_INTERNAL)) {
+                Object xInternalValue = property.getExtensions().get(X_INTERNAL);
+                boolean isInternal = false;
+                if (xInternalValue instanceof Boolean) {
+                    isInternal = (Boolean) xInternalValue;
+                } else if (xInternalValue instanceof String) {
+                    isInternal = Boolean.parseBoolean((String) xInternalValue);
+                }
+                if (isInternal) {
+                    property.getExtensions().remove(X_INTERNAL);
+                }
+            }
             Schema newProperty = normalizeSchema(property, new HashSet<>());
             propertiesEntry.setValue(newProperty);
         }
@@ -1011,6 +1031,7 @@ public class OpenAPINormalizer {
         if (schema.getAnyOf() == null) {
             return schema;
         }
+
         for (int i = 0; i < schema.getAnyOf().size(); i++) {
             // normalize anyOf sub schemas one by one
             Object item = schema.getAnyOf().get(i);
@@ -1083,10 +1104,10 @@ public class OpenAPINormalizer {
                     refSchema.setExtensions(new HashMap<>());
                 }
 
-                if (refSchema.getExtensions().containsKey("x-parent")) {
+                if (refSchema.getExtensions().containsKey(X_PARENT)) {
                     // doing nothing as x-parent already exists
                 } else {
-                    refSchema.getExtensions().put("x-parent", true);
+                    refSchema.getExtensions().put(X_PARENT, true);
                 }
 
                 LOGGER.debug("processUseAllOfRefAsParent added `x-parent: true` to {}", refSchema);
@@ -1108,7 +1129,7 @@ public class OpenAPINormalizer {
             return;
         }
 
-        if (Boolean.parseBoolean(String.valueOf(operation.getExtensions().get("x-internal")))) {
+        if (Boolean.parseBoolean(String.valueOf(operation.getExtensions().get(X_INTERNAL)))) {
             operation.getExtensions().remove(X_INTERNAL);
         }
     }

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

@@ -13,6 +13,7 @@ public enum VendorExtension {
     X_KOTLIN_IMPLEMENTS("x-kotlin-implements", ExtensionLevel.MODEL, "Ability to specify interfaces that model must implement", "empty array"),
     X_KOTLIN_IMPLEMENTS_FIELDS("x-kotlin-implements-fields", ExtensionLevel.MODEL, "Specify attributes that are implemented by the interface(s) added via `x-kotlin-implements`", "empty array"),
     X_SPRING_PAGINATED("x-spring-paginated", ExtensionLevel.OPERATION, "Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.", "false"),
+    X_SPRING_API_VERSION("x-spring-api-version", ExtensionLevel.OPERATION, "Value for 'version' attribute in @RequestMapping (for Spring 7 and above).", null),
     X_SPRING_PROVIDE_ARGS("x-spring-provide-args", ExtensionLevel.OPERATION, "Allows adding additional hidden parameters in the API specification to allow access to content such as header values or properties", "empty array"),
     X_DISCRIMINATOR_VALUE("x-discriminator-value", ExtensionLevel.MODEL, "Used with model inheritance to specify value for discriminator that identifies current model", ""),
     X_SETTER_EXTRA_ANNOTATION("x-setter-extra-annotation", ExtensionLevel.FIELD, "Custom annotation that can be specified over java setter for specific field", "When field is array & uniqueItems, then this extension is used to add `@JsonDeserialize(as = LinkedHashSet.class)` over setter, otherwise no value"),
@@ -26,8 +27,7 @@ public enum VendorExtension {
     X_OPERATION_EXTRA_ANNOTATION("x-operation-extra-annotation", ExtensionLevel.OPERATION, "List of custom annotations to be added to operation", null),
     X_VERSION_PARAM("x-version-param", ExtensionLevel.OPERATION_PARAMETER, "Marker property that tells that this parameter would be used for endpoint versioning. Applicable for headers & query params. true/false", null),
     X_PATTERN_MESSAGE("x-pattern-message", Arrays.asList(ExtensionLevel.FIELD, ExtensionLevel.OPERATION_PARAMETER), "Add this property whenever you need to customize the invalidation error message for the regex pattern of a variable", null),
-    X_ZERO_BASED_ENUM("x-zero-based-enum", ExtensionLevel.MODEL, "When used on an enum, the index will not be generated and the default numbering will be used, zero-based", "false"),
-    ;
+    X_ZERO_BASED_ENUM("x-zero-based-enum", ExtensionLevel.MODEL, "When used on an enum, the index will not be generated and the default numbering will be used, zero-based", "false");
 
     private final String name;
     private final List<ExtensionLevel> levels;

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

@@ -46,6 +46,7 @@ import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static org.openapitools.codegen.CodegenConstants.*;
 import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
 import static org.openapitools.codegen.utils.ModelUtils.getSchemaItems;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
@@ -116,6 +117,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
     // A cache to efficiently lookup schema `toModelName()` based on the schema Key
     private final Map<String, String> schemaKeyToModelNameCache = new HashMap<>();
 
+    // A cache to efficiently lookup CodegenModel `fromModel(codegenModelName, parentModelSchema)` based on the pair of model name and schema
+    private final Map<Map.Entry<String, Schema>, CodegenModel> codegenModelNameAndSchemaKeyToCodegenModelCache = new HashMap<>();
+
     public AbstractCSharpCodegen() {
         super();
 
@@ -543,7 +547,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
                         if (dataTypeSet.contains(oneOfProperty.dataType)) {
                             // add "x-duplicated-data-type" to indicate if the dataType already occurs before
                             // in other sub-schemas of allOf/anyOf/oneOf
-                            oneOfProperty.vendorExtensions.putIfAbsent("x-composed-data-type", true);
+                            oneOfProperty.vendorExtensions.putIfAbsent(X_COMPOSED_DATA_TYPE, true);
                         } else {
                             dataTypeSet.add(oneOfProperty.dataType);
                         }
@@ -557,7 +561,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
                         if (dataTypeSet.contains(anyOfProperty.dataType)) {
                             // add "x-duplicated-data-type" to indicate if the dataType already occurs before
                             // in other sub-schemas of allOf/anyOf/oneOf
-                            anyOfProperty.vendorExtensions.putIfAbsent("x-composed-data-type", true);
+                            anyOfProperty.vendorExtensions.putIfAbsent(X_COMPOSED_DATA_TYPE, true);
                         } else {
                             dataTypeSet.add(anyOfProperty.dataType);
                         }
@@ -619,7 +623,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
                 continue;
             }
 
-            model.vendorExtensions.put("x-model-is-mutable", modelIsMutable(model, null));
+            model.vendorExtensions.put(X_MODEL_IS_MUTABLE, modelIsMutable(model, null));
 
             CodegenComposedSchemas composedSchemas = model.getComposedSchemas();
             if (composedSchemas != null) {
@@ -639,7 +643,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
                         patchProperty(enumRefs, model, property);
                         property.name = patchPropertyName(model, property, camelize(property.baseType), composedPropertyNames);
                         property.isNullable = true;
-                        property.vendorExtensions.put("x-base-name", model.name.substring(model.name.lastIndexOf('_') + 1));
+                        property.vendorExtensions.put(X_BASE_NAME, model.name.substring(model.name.lastIndexOf('_') + 1));
                     }
                 }
 
@@ -650,7 +654,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
                         patchProperty(enumRefs, model, property);
                         property.name = patchPropertyName(model, property, camelize(property.baseType), composedPropertyNames);
                         property.isNullable = true;
-                        property.vendorExtensions.put("x-base-name", model.name.substring(model.name.lastIndexOf('_') + 1));
+                        property.vendorExtensions.put(X_BASE_NAME, model.name.substring(model.name.lastIndexOf('_') + 1));
                     }
                 }
             }
@@ -784,10 +788,10 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
 
     private void patchPropertyVendorExtensions(CodegenProperty property) {
         boolean isValueType = isValueType(property);
-        property.vendorExtensions.put("x-is-value-type", isValueType);
-        property.vendorExtensions.put("x-is-reference-type", !isValueType);
-        property.vendorExtensions.put("x-is-nullable-type", this.getNullableReferencesTypes() || isValueType);
-        property.vendorExtensions.put("x-is-base-or-new-discriminator", (property.isDiscriminator && !property.isInherited) || (property.isDiscriminator && property.isNew));
+        property.vendorExtensions.put(X_IS_VALUE_TYPE, isValueType);
+        property.vendorExtensions.put(X_IS_REFERENCE_TYPE, !isValueType);
+        property.vendorExtensions.put(X_IS_NULLABLE_TYPE, this.getNullableReferencesTypes() || isValueType);
+        property.vendorExtensions.put(X_IS_BASE_OR_NEW_DISCRIMINATOR, (property.isDiscriminator && !property.isInherited) || (property.isDiscriminator && property.isNew));
     }
 
     protected void patchPropertyIsInherited(CodegenModel model, CodegenProperty property) {
@@ -888,7 +892,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
         // Because C# uses nullable primitives for datatype, and datatype is used in DefaultCodegen for determining enum-ness, guard against weirdness here.
         if (var.isEnum) {
             if ("byte".equals(var.dataFormat)) {// C# Actually supports byte and short enums.
-                var.vendorExtensions.put("x-enum-byte", true);
+                var.vendorExtensions.put(X_ENUM_BYTE, true);
                 var.isString = false;
                 var.isLong = false;
                 var.isInteger = false;
@@ -909,7 +913,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
     }
 
     private void postProcessResponseCode(CodegenResponse response, String status, Set<String> httpStatusesWithReturn) {
-        response.vendorExtensions.put("x-http-status", status);
+        response.vendorExtensions.put(X_HTTP_STATUS, status);
         if (response.dataType != null) {
             httpStatusesWithReturn.add(status);
         }
@@ -942,11 +946,11 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
     }
 
     private void postProcessOperations(OperationMap operations, List<ModelMap> allModels) {
-        Set<String> httpStatusesWithReturn = additionalProperties.get("x-http-statuses-with-return") instanceof Set<?>
-                ? (Set<String>) additionalProperties.get("x-http-statuses-with-return")
+        Set<String> httpStatusesWithReturn = additionalProperties.get(X_HTTP_STATUSES_WITH_RETURN) instanceof Set<?>
+                ? (Set<String>) additionalProperties.get(X_HTTP_STATUSES_WITH_RETURN)
                 : new HashSet<String>();
 
-        additionalProperties.put("x-http-statuses-with-return", httpStatusesWithReturn);
+        additionalProperties.put(X_HTTP_STATUSES_WITH_RETURN, httpStatusesWithReturn);
 
         HashMap<String, CodegenModel> modelMaps = ModelMap.toCodegenModelMap(allModels);
 
@@ -955,7 +959,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
             for (CodegenOperation operation : ops) {
                 String duplicates = duplicateOf.get(operation.operationId);
                 if (duplicates != null) {
-                    operation.vendorExtensions.put("x-duplicates", duplicates);
+                    operation.vendorExtensions.put(X_DUPLICATES, duplicates);
                 } else {
                     duplicateOf.put(operation.operationId, operations.getClassname());
                 }
@@ -964,13 +968,13 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
 
                         if (response.returnProperty != null) {
                             Boolean isValueType = isValueType(response.returnProperty);
-                            response.vendorExtensions.put("x-is-value-type", isValueType);
-                            response.vendorExtensions.put("x-is-reference-type", !isValueType);
+                            response.vendorExtensions.put(X_IS_VALUE_TYPE, isValueType);
+                            response.vendorExtensions.put(X_IS_REFERENCE_TYPE, !isValueType);
                         }
 
                         if (response.headers != null && response.headers.stream().anyMatch(h -> h.baseName.equals("Set-Cookie"))) {
-                            response.vendorExtensions.put("x-set-cookie", true);
-                            operation.vendorExtensions.put("x-set-cookie", true);
+                            response.vendorExtensions.put(X_SET_COOKIE, true);
+                            operation.vendorExtensions.put(X_SET_COOKIE, true);
                         }
 
                         String code = response.code.toLowerCase(Locale.ROOT);
@@ -978,9 +982,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
                             case "default":
                             case "0":
                                 postProcessResponseCode(response, "Default", httpStatusesWithReturn);
-                                response.vendorExtensions.put("x-http-status-is-default", true);
+                                response.vendorExtensions.put(X_HTTP_STATUS_IS_DEFAULT, true);
                                 if ((long) operation.responses.size() == 1) {
-                                    response.vendorExtensions.put("x-only-default", true);
+                                    response.vendorExtensions.put(X_ONLY_DEFAULT, true);
                                 }
                                 break;
                             case "100":
@@ -1161,23 +1165,23 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
                                 postProcessResponseCode(response, "NetworkAuthenticationRequired", httpStatusesWithReturn);
                                 break;
                             case "1xx":
-                                response.vendorExtensions.put("x-http-status-range", 1);
+                                response.vendorExtensions.put(X_HTTP_STATUS_RANGE, 1);
                                 postProcessResponseCode(response, "HttpStatusCode1XX", httpStatusesWithReturn);
                                 break;
                             case "2xx":
-                                response.vendorExtensions.put("x-http-status-range", 2);
+                                response.vendorExtensions.put(X_HTTP_STATUS_RANGE, 2);
                                 postProcessResponseCode(response, "HttpStatusCode2XX", httpStatusesWithReturn);
                                 break;
                             case "3xx":
-                                response.vendorExtensions.put("x-http-status-range", 3);
+                                response.vendorExtensions.put(X_HTTP_STATUS_RANGE, 3);
                                 postProcessResponseCode(response, "HttpStatusCode3XX", httpStatusesWithReturn);
                                 break;
                             case "4xx":
-                                response.vendorExtensions.put("x-http-status-range", 4);
+                                response.vendorExtensions.put(X_HTTP_STATUS_RANGE, 4);
                                 postProcessResponseCode(response, "HttpStatusCode4XX", httpStatusesWithReturn);
                                 break;
                             case "5xx":
-                                response.vendorExtensions.put("x-http-status-range", 5);
+                                response.vendorExtensions.put(X_HTTP_STATUS_RANGE, 5);
                                 postProcessResponseCode(response, "HttpStatusCode5XX", httpStatusesWithReturn);
                                 break;
                             default:
@@ -1278,9 +1282,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
                     patchParameter(model, parameter);
                 }
 
-                List<CodegenParameter> referenceTypes = operation.allParams.stream().filter(p -> p.vendorExtensions.get("x-is-value-type") == null && !p.isNullable).collect(Collectors.toList());
-                operation.vendorExtensions.put("x-not-nullable-reference-types", referenceTypes);
-                operation.vendorExtensions.put("x-has-not-nullable-reference-types", referenceTypes.size() > 0);
+                List<CodegenParameter> referenceTypes = operation.allParams.stream().filter(p -> p.vendorExtensions.get(X_IS_VALUE_TYPE) == null && !p.isNullable).collect(Collectors.toList());
+                operation.vendorExtensions.put(X_NOT_NULLABLE_REFERENCE_TYPES, referenceTypes);
+                operation.vendorExtensions.put(X_HAS_NOT_NULLABLE_REFERENCE_TYPES, referenceTypes.size() > 0);
                 processOperation(operation);
 
                 // Remove constant params from allParams list and add to constantParams
@@ -1291,7 +1295,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
 
     protected void patchVendorExtensionNullableValueType(CodegenParameter parameter) {
         if (parameter.isNullable && !parameter.isContainer && (this.getValueTypes().contains(parameter.dataType) || parameter.isEnum)) {
-            parameter.vendorExtensions.put("x-nullable-value-type", true);
+            parameter.vendorExtensions.put(X_NULLABLE_VALUE_TYPE, true);
         }
     }
 
@@ -1307,15 +1311,15 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
      */
     protected void patchVendorExtensionNullableValueTypeLegacy(CodegenParameter parameter) {
         if (parameter.isNullable && !parameter.isContainer && (this.getNullableTypes().contains(parameter.dataType) || parameter.isEnum)) {
-            parameter.vendorExtensions.put("x-nullable-value-type", true);
+            parameter.vendorExtensions.put(X_NULLABLE_VALUE_TYPE, true);
         }
     }
 
     private void patchParameter(CodegenModel model, CodegenParameter parameter) {
         patchVendorExtensionNullableValueType(parameter);
 
-        if (this.getNullableReferencesTypes() || (parameter.vendorExtensions.get("x-nullable-value-type") != null)) {
-            parameter.vendorExtensions.put("x-nullable-type", true);
+        if (this.getNullableReferencesTypes() || (parameter.vendorExtensions.get(X_NULLABLE_VALUE_TYPE) != null)) {
+            parameter.vendorExtensions.put(X_NULLABLE_TYPE, true);
         }
 
         if (!isSupportNullable()) {
@@ -1362,12 +1366,12 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
                 parameter.isEnum = true;
                 parameter.allowableValues = model.allowableValues;
                 parameter.isPrimitiveType = true;
-                parameter.vendorExtensions.put("x-csharp-value-type", true);
+                parameter.vendorExtensions.put(X_CSHARP_VALUE_TYPE, true);
             }
         }
 
         if (!parameter.isContainer && this.getNullableTypes().contains(parameter.dataType)) {
-            parameter.vendorExtensions.put("x-csharp-value-type", true);
+            parameter.vendorExtensions.put(X_CSHARP_VALUE_TYPE, true);
         }
     }
 
@@ -1377,12 +1381,12 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
                 parameter.isEnum = true;
                 parameter.allowableValues = model.allowableValues;
                 parameter.isPrimitiveType = true;
-                parameter.vendorExtensions.put("x-is-value-type", true);
+                parameter.vendorExtensions.put(X_IS_VALUE_TYPE, true);
             }
         }
 
         if (!parameter.isContainer && this.getValueTypes().contains(parameter.dataType)) {
-            parameter.vendorExtensions.put("x-is-value-type", true);
+            parameter.vendorExtensions.put(X_IS_VALUE_TYPE, true);
         }
     }
 
@@ -1703,6 +1707,17 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
         return toModelName(name) + "Tests";
     }
 
+    protected CodegenModel getCodegenModel(String codegenModelName, Schema schema){
+       var key = new AbstractMap.SimpleEntry<>(codegenModelName, schema);
+       if(codegenModelNameAndSchemaKeyToCodegenModelCache.containsKey(key)){
+           return codegenModelNameAndSchemaKeyToCodegenModelCache.get(key);
+       }
+
+       CodegenModel model = super.fromModel(codegenModelName, schema);
+       codegenModelNameAndSchemaKeyToCodegenModelCache.put(key, model);
+       return model;
+    }
+
     public void setNullableReferenceTypes(final Boolean nullReferenceTypesFlag) {
         this.nullReferenceTypesFlag = nullReferenceTypesFlag;
         additionalProperties.put("nullableReferenceTypes", nullReferenceTypesFlag);
@@ -2050,13 +2065,13 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
                 } else if (c == 'l') {
                     modifiers.remove("CultureInvariant");
                 } else {
-                    vendorExtensions.put("x-modifier-" + c, c);
+                    vendorExtensions.put(X_MODIFIER_PREFIX + c, c);
                 }
             }
 
             String regex = pattern.substring(start, end).replace("\"", "\"\"");
-            vendorExtensions.put("x-regex", regex);
-            vendorExtensions.put("x-modifiers", modifiers);
+            vendorExtensions.put(X_REGEX, regex);
+            vendorExtensions.put(X_MODIFIERS, modifiers);
         }
     }
 

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

@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.util.*;
 
+import static org.openapitools.codegen.CodegenConstants.X_ENUM_BYTE;
 import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -433,7 +434,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
                     if (model.dataType.startsWith("byte")) {
                         // F# Actually supports byte and short enums, swagger spec only supports byte.
                         isByte = true;
-                        model.vendorExtensions.put("x-enum-byte", true);
+                        model.vendorExtensions.put(X_ENUM_BYTE, true);
                     } else if (model.dataType.startsWith("int32")) {
                         isInteger = true;
                         model.vendorExtensions.put("x-enum-integer", true);
@@ -487,7 +488,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
         // Because C# uses nullable primitives for datatype, and datatype is used in DefaultCodegen for determining enum-ness, guard against weirdness here.
         if (var.isEnum) {
             if ("byte".equals(var.dataFormat)) {// C# Actually supports byte and short enums.
-                var.vendorExtensions.put("x-enum-byte", true);
+                var.vendorExtensions.put(X_ENUM_BYTE, true);
                 var.isString = false;
                 var.isLong = false;
                 var.isInteger = false;

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

@@ -40,6 +40,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static org.openapitools.codegen.CodegenConstants.X_MODIFIERS;
+import static org.openapitools.codegen.CodegenConstants.X_REGEX;
 import static org.openapitools.codegen.utils.StringUtils.*;
 
 
@@ -1353,9 +1355,9 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
                 }
             }
 
-            vendorExtensions.put("x-regex", regex.replace("\"", "\\\""));
+            vendorExtensions.put(X_REGEX, regex.replace("\"", "\\\""));
             vendorExtensions.put("x-pattern", pattern.replace("\"", "\\\""));
-            vendorExtensions.put("x-modifiers", modifiers);
+            vendorExtensions.put(X_MODIFIERS, modifiers);
         }
     }
 

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

@@ -46,6 +46,8 @@ import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
+import static org.openapitools.codegen.CodegenConstants.X_MODIFIERS;
+import static org.openapitools.codegen.CodegenConstants.X_REGEX;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 
 public abstract class AbstractPythonConnexionServerCodegen extends AbstractPythonCodegen implements CodegenConfig {
@@ -743,8 +745,8 @@ public abstract class AbstractPythonConnexionServerCodegen extends AbstractPytho
                 }
             }
 
-            vendorExtensions.put("x-regex", regex);
-            vendorExtensions.put("x-modifiers", modifiers);
+            vendorExtensions.put(X_REGEX, regex);
+            vendorExtensions.put(X_MODIFIERS, modifiers);
         }
     }
 }

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

@@ -39,6 +39,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static org.openapitools.codegen.CodegenConstants.X_MODIFIERS;
+import static org.openapitools.codegen.CodegenConstants.X_REGEX;
 import static org.openapitools.codegen.utils.StringUtils.*;
 
 public abstract class AbstractPythonPydanticV1Codegen extends DefaultCodegen implements CodegenConfig {
@@ -1915,9 +1917,9 @@ public abstract class AbstractPythonPydanticV1Codegen extends DefaultCodegen imp
                 }
             }
 
-            vendorExtensions.put("x-regex", regex.replace("\"", "\\\""));
+            vendorExtensions.put(X_REGEX, regex.replace("\"", "\\\""));
             vendorExtensions.put("x-pattern", pattern.replace("\"", "\\\""));
-            vendorExtensions.put("x-modifiers", modifiers);
+            vendorExtensions.put(X_MODIFIERS, modifiers);
         }
     }
 

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

@@ -37,6 +37,7 @@ import java.net.URL;
 import java.util.*;
 
 import static java.util.UUID.randomUUID;
+import static org.openapitools.codegen.CodegenConstants.X_CSHARP_VALUE_TYPE;
 
 public class AspNetServerCodegen extends AbstractCSharpCodegen {
 
@@ -347,7 +348,7 @@ public class AspNetServerCodegen extends AbstractCSharpCodegen {
     protected void updateCodegenParameterEnum(CodegenParameter parameter, CodegenModel model) {
         super.updateCodegenParameterEnumLegacy(parameter, model);
 
-        if (!parameter.required && parameter.vendorExtensions.get("x-csharp-value-type") != null) { //optional
+        if (!parameter.required && parameter.vendorExtensions.get(X_CSHARP_VALUE_TYPE) != null) { //optional
             parameter.dataType = parameter.dataType + "?";
         }
     }
@@ -627,7 +628,7 @@ public class AspNetServerCodegen extends AbstractCSharpCodegen {
         super.patchProperty(enumRefs, model, property);
 
         if (!property.isContainer && (this.getNullableTypes().contains(property.dataType) || property.isEnum)) {
-            property.vendorExtensions.put("x-csharp-value-type", true);
+            property.vendorExtensions.put(X_CSHARP_VALUE_TYPE, true);
         }
     }
 

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

@@ -39,6 +39,7 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.openapitools.codegen.CodegenConstants.X_CSHARP_VALUE_TYPE;
 import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -409,7 +410,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
 
         super.updateCodegenParameterEnumLegacy(parameter, model);
 
-        if (!parameter.required && parameter.vendorExtensions.get("x-csharp-value-type") != null) { //optional
+        if (!parameter.required && parameter.vendorExtensions.get(X_CSHARP_VALUE_TYPE) != null) { //optional
             parameter.dataType = parameter.dataType + "?";
         }
     }
@@ -436,7 +437,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         if (allDefinitions != null && codegenModel != null && codegenModel.parent != null) {
             final Schema<?> parentModel = allDefinitions.get(toModelName(codegenModel.parent));
             if (parentModel != null) {
-                final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
+                final CodegenModel parentCodegenModel = getCodegenModel(codegenModel.parent, parentModel);
                 if (codegenModel.hasEnums) {
                     codegenModel = this.reconcileInlineEnums(codegenModel, parentCodegenModel);
                 }
@@ -1626,7 +1627,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
 
         if (!GENERICHOST.equals(getLibrary())) {
             if (!property.isContainer && (this.getNullableTypes().contains(property.dataType) || property.isEnum)) {
-                property.vendorExtensions.put("x-csharp-value-type", true);
+                property.vendorExtensions.put(X_CSHARP_VALUE_TYPE, true);
             }
         }
     }

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

@@ -36,6 +36,7 @@ import java.net.URL;
 import java.util.*;
 
 import static java.util.UUID.randomUUID;
+import static org.openapitools.codegen.CodegenConstants.X_CSHARP_VALUE_TYPE;
 
 public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen {
 
@@ -287,7 +288,7 @@ public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen {
         super.patchProperty(enumRefs, model, property);
 
         if (!property.isContainer && (this.getNullableTypes().contains(property.dataType) || property.isEnum)) {
-            property.vendorExtensions.put("x-csharp-value-type", true);
+            property.vendorExtensions.put(X_CSHARP_VALUE_TYPE, true);
         }
     }
 
@@ -295,7 +296,7 @@ public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen {
     protected void updateCodegenParameterEnum(CodegenParameter parameter, CodegenModel model) {
         super.updateCodegenParameterEnumLegacy(parameter, model);
 
-        if (!parameter.required && parameter.vendorExtensions.get("x-csharp-value-type") != null) { //optional
+        if (!parameter.required && parameter.vendorExtensions.get(X_CSHARP_VALUE_TYPE) != null) { //optional
             parameter.dataType = parameter.dataType + "?";
         }
     }

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

@@ -37,6 +37,7 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.openapitools.codegen.CodegenConstants.X_CSHARP_VALUE_TYPE;
 import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -350,7 +351,7 @@ public class CSharpReducedClientCodegen extends AbstractCSharpCodegen {
         super.patchProperty(enumRefs, model, property);
 
         if (!property.isContainer && (this.getNullableTypes().contains(property.dataType) || property.isEnum)) {
-            property.vendorExtensions.put("x-csharp-value-type", true);
+            property.vendorExtensions.put(X_CSHARP_VALUE_TYPE, true);
         }
     }
 
@@ -358,7 +359,7 @@ public class CSharpReducedClientCodegen extends AbstractCSharpCodegen {
     protected void updateCodegenParameterEnum(CodegenParameter parameter, CodegenModel model) {
         super.updateCodegenParameterEnumLegacy(parameter, model);
 
-        if (!parameter.required && parameter.vendorExtensions.get("x-csharp-value-type") != null) { //optional
+        if (!parameter.required && parameter.vendorExtensions.get(X_CSHARP_VALUE_TYPE) != null) { //optional
             parameter.dataType = parameter.dataType + "?";
         }
     }
@@ -380,7 +381,7 @@ public class CSharpReducedClientCodegen extends AbstractCSharpCodegen {
         if (allDefinitions != null && codegenModel != null && codegenModel.parent != null) {
             final Schema parentModel = allDefinitions.get(toModelName(codegenModel.parent));
             if (parentModel != null) {
-                final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
+                final CodegenModel parentCodegenModel = getCodegenModel(codegenModel.parent, parentModel);
                 if (codegenModel.hasEnums) {
                     codegenModel = this.reconcileInlineEnums(codegenModel, parentCodegenModel);
                 }

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

@@ -226,6 +226,7 @@ public class ElixirClientCodegen extends DefaultCodegen {
         typeMapping.put("date", "Date.t");
         typeMapping.put("date-time", "DateTime.t");
         // other
+        typeMapping.put("AnyType", "any()");
         typeMapping.put("ByteArray", "binary()");
         typeMapping.put("DateTime", "DateTime.t");
         typeMapping.put("UUID", "String.t");

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

@@ -410,6 +410,7 @@ public class GoServerCodegen extends AbstractGoCodegen {
     private void addConditionalImportInformation(OperationsMap operations) {
         boolean hasPathParams = false;
         boolean hasBodyParams = false;
+        boolean hasOptionalBodyParams = false;
 
         for (CodegenOperation op : operations.getOperations().getOperation()) {
             if (op.getHasPathParams()) {
@@ -418,10 +419,14 @@ public class GoServerCodegen extends AbstractGoCodegen {
             if (op.getHasBodyParam()) {
                 hasBodyParams = true;
             }
+            if (op.getHasOptionalBodyParam()) {
+                hasOptionalBodyParams = true;
+            }
         }
 
         additionalProperties.put("hasPathParams", hasPathParams);
         additionalProperties.put("hasBodyParams", hasBodyParams);
+        additionalProperties.put("hasOptionalBodyParams", hasOptionalBodyParams);
     }
 
 

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

@@ -18,6 +18,7 @@
 package org.openapitools.codegen.languages;
 
 import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import org.openapitools.codegen.*;
@@ -115,6 +116,20 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen
         return "jaxrs-cxf-client";
     }
 
+    @Override
+    public List<DocumentationProvider> supportedDocumentationProvider() {
+        return List.of(DocumentationProvider.NONE, DocumentationProvider.SWAGGER1, DocumentationProvider.SWAGGER2);
+    }
+
+    @Override
+    public List<AnnotationLibrary> supportedAnnotationLibraries() {
+        return List.of(AnnotationLibrary.NONE, AnnotationLibrary.SWAGGER1, AnnotationLibrary.SWAGGER2);
+    }
+
+    @Override
+    public DocumentationProvider defaultDocumentationProvider() {
+        return DocumentationProvider.SWAGGER1;
+    }
 
     @Override
     public CodegenType getTag() {
@@ -127,11 +142,19 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen
         co.subresourceOperation = !co.path.isEmpty();
     }
 
+    @Override
+    public CodegenModel fromModel(String name, Schema model) {
+        CodegenModel m = super.fromModel(name, model);
+        m.imports.remove("ApiModel");
+        return m;
+    }
+
     @Override
     public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
         super.postProcessModelProperty(model, property);
         model.imports.remove("ApiModelProperty");
         model.imports.remove("ApiModel");
+        model.imports.remove("JsonTypeName");
 
         if (jackson) {
             //Add jackson imports when model has inner enum

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

@@ -18,6 +18,7 @@
 package org.openapitools.codegen.languages;
 
 import lombok.Setter;
+import io.swagger.v3.oas.models.media.Schema;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.languages.features.CXFServerFeatures;
 import org.openapitools.codegen.languages.features.GzipTestFeatures;
@@ -222,12 +223,35 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen
         return "jaxrs-cxf";
     }
 
+    @Override
+    public List<DocumentationProvider> supportedDocumentationProvider() {
+        return List.of(DocumentationProvider.NONE, DocumentationProvider.SWAGGER1, DocumentationProvider.SWAGGER2);
+    }
+
+    @Override
+    public List<AnnotationLibrary> supportedAnnotationLibraries() {
+        return List.of(AnnotationLibrary.NONE, AnnotationLibrary.SWAGGER1, AnnotationLibrary.SWAGGER2);
+    }
+
+    @Override
+    public DocumentationProvider defaultDocumentationProvider() {
+        return DocumentationProvider.SWAGGER1;
+    }
+
+    @Override
+    public CodegenModel fromModel(String name, Schema model) {
+        CodegenModel m = super.fromModel(name, model);
+        m.imports.remove("ApiModel");
+        return m;
+    }
+
     @Override
     public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
         super.postProcessModelProperty(model, property);
         model.imports.remove("ApiModelProperty");
         model.imports.remove("ApiModel");
         model.imports.remove("JsonFormat");
+        model.imports.remove("JsonTypeName");
 
         //Add imports for Jackson when model has inner enum
         if (isJackson()) {

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

@@ -1088,6 +1088,10 @@ public class JavaClientCodegen extends AbstractJavaCodegen
             }
         }
 
+        if (!AnnotationLibrary.SWAGGER2.equals(getAnnotationLibrary())) {
+            codegenModel.imports.remove("Schema");
+        }
+
         return codegenModel;
     }
 

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

@@ -996,6 +996,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
         }
         return objs;
     }
+
     private Stream<List<CodegenProperty>> getAllVarProperties(CodegenModel model) {
         return Stream.of(model.vars, model.allVars, model.optionalVars, model.requiredVars, model.readOnlyVars, model.readWriteVars);
     }
@@ -1113,6 +1114,27 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
         return false;
     }
 
+    @Override
+    public void postProcessParameter(CodegenParameter parameter) {
+        super.postProcessParameter(parameter);
+        adjustEnumRefDefault(parameter);
+    }
+
+    /**
+     * Properly set the default value for enum (reference).
+     *
+     * @param param codegen parameter
+     */
+    private void adjustEnumRefDefault(CodegenParameter param) {
+        if (StringUtils.isEmpty(param.defaultValue) || !(param.isEnum || param.isEnumRef)) {
+            return;
+        }
+
+        String type = StringUtils.defaultIfEmpty(param.datatypeWithEnum, param.dataType);
+        param.enumDefaultValue = toEnumVarName(param.defaultValue, type);
+        param.defaultValue = type + "." + param.enumDefaultValue;
+    }
+
     @Override
     public void postProcess() {
         System.out.println("################################################################################");