Merge branch 'kotlin_kotlinxserialization_polymorphism' of https://github.com/Nuglif/openapi-generator into Nuglif-kotlin_kotlinxserialization_polymorphism

The Serializer check the mapping value in the discriminator field
of the json we received to find the children Serializer

.envrc

@@ -1 +1 @@
-has nix && use flake
+use flake

.github/.test/samples.json

@@ -319,6 +319,12 @@
         "Client: Java"
       ]
     },
+    {
+      "input": "java-petstore-jersey1.sh",
+      "matches": [
+        "Client: Java"
+      ]
+    },
     {
       "input": "java-petstore-jersey2-java6.sh",
       "matches": [
@@ -578,6 +584,18 @@
         "Server: Java"
       ]
     },
+    {
+      "input": "jaxrs-jersey1-petstore-server.sh",
+      "matches": [
+        "Server: Java"
+      ]
+    },
+    {
+      "input": "jaxrs-jersey1-usetags-petstore-server.sh",
+      "matches": [
+        "Server: Java"
+      ]
+    },
     {
       "input": "jaxrs-petstore-server-datelib-j8.sh",
       "matches": [

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,14 +8,18 @@
 - [ ] Run the following to [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) and update samples:
   ```
   ./mvnw clean package 
-  ./bin/generate-samples.sh ./bin/configs/*.yaml
+  ./bin/generate-samples.sh
   ./bin/utils/export_docs_generators.sh
   ``` 
-  (For Windows users, please run the script in [Git BASH](https://gitforwindows.org/))
   Commit all changed files. 
   This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. 
   These must match the expectations made by your contribution. 
   You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`. 
-  IMPORTANT: Do **NOT** purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
-- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (upcoming 7.1.0 minor release - breaking changes with fallbacks), `8.0.x` (breaking changes without fallbacks)
+  For Windows users, please run the script in [Git BASH](https://gitforwindows.org/).
+- [ ] In case you are adding a new generator, run the following additional script : 
+  ```
+  ./bin/utils/ensure-up-to-date
+  ``` 
+  Commit all changed files.
+- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (7.0.1 - patch release), `7.1.x` (minor release - breaking changes with fallbacks), `8.0.x` (breaking changes without fallbacks)
 - [ ] If your PR is targeting a particular programming language, @mention the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) members, so they are more likely to review the pull request.

.github/workflows/docker.yaml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Test run-in-docker.sh
         shell: bash

.github/workflows/gradle-plugin-tests.yaml

@@ -13,7 +13,7 @@ jobs:
     name: Gradle plugin tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:

.github/workflows/gradle-test.yaml

@@ -30,7 +30,7 @@ jobs:
           - samples/client/petstore/java/okhttp-gson-group-parameter
           - samples/client/petstore/java/webclient-swagger2
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

.github/workflows/linux.yaml

@@ -20,7 +20,7 @@ jobs:
         os: [ubuntu-latest]
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v3
@@ -45,7 +45,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.10.0
+        uses: s4u/setup-maven-action@v1.9.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8
@@ -85,9 +85,9 @@ jobs:
         os: [ubuntu-latest]
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.10.0
+        uses: s4u/setup-maven-action@v1.9.0
         with:
           java-version: 11
           maven-version: 3.8.8

.github/workflows/maven-plugin-tests.yaml

@@ -13,7 +13,7 @@ jobs:
     name: Maven plugin tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:

.github/workflows/misc-test.yaml

@@ -15,7 +15,7 @@ jobs:
     name: Misc tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.6'

.github/workflows/openapi-generator.yaml

@@ -15,7 +15,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
@@ -53,7 +53,7 @@ jobs:
     needs:
       - build
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
@@ -90,7 +90,7 @@ jobs:
     needs:
       - build
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
@@ -129,7 +129,7 @@ jobs:
       - build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:

.github/workflows/samples-c-libcurl-client.yaml

@@ -13,7 +13,7 @@ jobs:
     name: Build c libcurl client
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Prepare
         run: |
           sudo apt-get update

.github/workflows/samples-cpp-qt-client.yaml

@@ -28,8 +28,8 @@ jobs:
             tools: 'tools_openssl_x64'
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: jurplel/install-qt-action@v4
+      - uses: actions/checkout@v3
+      - uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt-version }}
           tools: ${{ matrix.tools }}

.github/workflows/samples-dart.yaml

@@ -17,7 +17,7 @@ jobs:
     name: Tests Dart
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

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

@@ -18,7 +18,7 @@ jobs:
           # clients
           - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: 3.1.*

.github/workflows/samples-dotnet.yaml

@@ -42,7 +42,7 @@ jobs:
           - samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse
           - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: '7.0.x'

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

@@ -18,7 +18,7 @@ jobs:
           # clients
           - samples/client/echo_api/csharp-restsharp/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: '6.0.x'
@@ -28,6 +28,4 @@ jobs:
           (cd http-echo-server && npm install && npm start &)
       - name: Build
         working-directory: ${{ matrix.sample }}
-        run: |
-          dotnet build Org.OpenAPITools.sln
-          dotnet test Org.OpenAPITools.sln
+        run: dotnet build Org.OpenAPITools.sln

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

@@ -72,7 +72,7 @@ jobs:
           # build C# API client (property, parameter name mappings)
           - samples/client/petstore/csharp-restsharp-name-parameter-mappings
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: '6.0.x'

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

@@ -29,7 +29,7 @@ jobs:
           - samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse
           - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: '6.0.x'

.github/workflows/samples-elm.yaml

@@ -21,7 +21,7 @@ jobs:
           - samples/client/petstore/elm
           - samples/openapi3/client/elm
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: jorelali/setup-elm@v5
         with:
           elm-version: 0.19.1

.github/workflows/samples-erlang.yaml

@@ -26,7 +26,7 @@ jobs:
           - samples/client/petstore/erlang-client/
           - samples/client/petstore/erlang-proper/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: erlef/setup-beam@v1
         with:
           otp-version: '22.2'

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

@@ -1,32 +0,0 @@
-name: Go Client (Echo API)
-
-on:
-  pull_request:
-    paths:
-      - samples/client/echo_api/go/**
-      - .github/workflows/samples-go-client-echo-api.yaml
-jobs:
-  build:
-    name: Test Go client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/client/echo_api/go
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
-        with:
-          go-version: "stable"
-      - name: Setup node.js
-        uses: actions/setup-node@v4
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && npm install && npm start &)
-      - run: go version
-      - name: Run test
-        working-directory: ${{ matrix.sample }}
-        run: go test -mod=mod -v

.github/workflows/samples-go.yaml

@@ -24,7 +24,7 @@ jobs:
           - samples/server/petstore/go-api-server/
           - samples/server/petstore/go-chi-server/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
           go-version: "stable"

.github/workflows/samples-groovy.yaml

@@ -21,7 +21,7 @@ jobs:
         sample:
           - samples/client/petstore/groovy
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

.github/workflows/samples-haskell.yaml

@@ -24,7 +24,7 @@ jobs:
           - samples/server/petstore/haskell-servant/
           - samples/client/petstore/haskell-http-client/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: haskell/actions/setup@v2
         with:
           # ghc-version: '8.8.4' # Exact version of ghc to use

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

@@ -20,7 +20,7 @@ jobs:
           - samples/client/echo_api/java/native
           - samples/client/echo_api/java/feign-gson
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
@@ -34,7 +34,7 @@ jobs:
             ~/.m2
           key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
       - name: Setup node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
       - name: Run echo server
         run: |
           git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server

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

@@ -24,7 +24,7 @@ jobs:
           - samples/client/echo_api/java/feign-gson
           - samples/client/echo_api/java/okhttp-gson
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
@@ -38,7 +38,7 @@ jobs:
             ~/.m2
           key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
       - name: Setup node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
       - name: Run echo server
         run: |
           git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server

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

@@ -10,9 +10,6 @@ on:
       - samples/openapi3/client/petstore/java/jersey2-java8-swagger1/**
       - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/**
       - samples/openapi3/client/petstore/java/native**
-      - samples/client/others/java/okhttp-gson-oneOf/**
-      - samples/client/others/java/resttemplate-useAbstractionForFiles/**
-      - samples/client/others/java/webclient-useAbstractionForFiles/**
   pull_request:
     paths:
       - 'samples/client/petstore/java/**'
@@ -22,9 +19,6 @@ on:
       - samples/openapi3/client/petstore/java/jersey2-java8-swagger1/**
       - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/**
       - samples/openapi3/client/petstore/java/native**
-      - samples/client/others/java/okhttp-gson-oneOf/**
-      - samples/client/others/java/resttemplate-useAbstractionForFiles/**
-      - samples/client/others/java/webclient-useAbstractionForFiles/**
 jobs:
   build:
     name: Build Java Client JDK11
@@ -49,6 +43,7 @@ jobs:
           - samples/client/petstore/java/webclient-swagger2
           - samples/client/petstore/java/vertx
           - samples/client/petstore/java/jersey2-java8-localdatetime
+          - samples/client/petstore/java/resteasy
           - samples/client/petstore/java/google-api-client
           - samples/client/petstore/java/rest-assured
           - samples/client/petstore/java/rest-assured-jackson
@@ -58,7 +53,7 @@ jobs:
           - samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml
           - samples/client/petstore/java/apache-httpclient
           - samples/client/petstore/java/feign
-          - samples/client/petstore/java/okhttp-gson-awsv4signature
+          - samples/client/petstore/java/jersey1
           - samples/openapi3/client/petstore/java/jersey2-java8-special-characters
           - samples/openapi3/client/petstore/java/native
           - samples/client/petstore/java/okhttp-gson-swagger1/
@@ -67,11 +62,8 @@ jobs:
           - samples/client/petstore/java/okhttp-gson-swagger2/
           - samples/client/petstore/java/resttemplate-swagger2/
           - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/
-          - samples/client/others/java/okhttp-gson-oneOf/
-          - samples/client/others/java/resttemplate-useAbstractionForFiles/
-          - samples/client/others/java/webclient-useAbstractionForFiles/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
@@ -86,4 +78,4 @@ jobs:
           key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
       - name: Build
         working-directory: ${{ matrix.sample }}
-        run: mvn clean package
+        run: mvn clean package

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

@@ -21,7 +21,7 @@ jobs:
           - samples/client/petstore/java/resttemplate-jakarta
           - samples/client/petstore/java/webclient-jakarta
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

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

@@ -23,7 +23,7 @@ jobs:
           - samples/server/petstore/java-helidon-server/se
         version: [17]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

.github/workflows/samples-java-play-framework.yaml

@@ -29,7 +29,7 @@ jobs:
           - samples/server/petstore/java-play-framework-no-swagger-ui
           - samples/server/petstore/java-play-framework-no-wrap-calls
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

.github/workflows/samples-java-server-jdk8.yaml

@@ -8,7 +8,6 @@ on:
       - 'samples/server/petstore/java-vertx-web/**'
       - 'samples/server/petstore/java-inflector/**'
       - 'samples/server/petstore/java-pkmst/**'
-      # test in circleci instead
       - 'samples/server/petstore/java-undertow/**'
   pull_request:
     paths:
@@ -16,7 +15,7 @@ on:
       - 'samples/server/petstore/java-vertx-web/**'
       - 'samples/server/petstore/java-inflector/**'
       - 'samples/server/petstore/java-pkmst/**'
-      #- 'samples/server/petstore/java-undertow/**'
+      - 'samples/server/petstore/java-undertow/**'
 jobs:
   build:
     name: Build Java Server
@@ -30,9 +29,9 @@ jobs:
           - samples/server/petstore/java-vertx-web/
           - samples/server/petstore/java-inflector/
           - samples/server/petstore/java-pkmst/
-          #- samples/server/petstore/java-undertow/
+          - samples/server/petstore/java-undertow/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

.github/workflows/samples-jaxrs-jdk11.yaml

@@ -1,36 +0,0 @@
-name: Samples JAX-RS (JDK11)
-
-on:
-  push:
-    paths:
-      - samples/server/petstore/jaxrs/jersey3/**
-  pull_request:
-    paths:
-      - samples/server/petstore/jaxrs/jersey3/**
-jobs:
-  build:
-    name: Build JAX-RS
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # servers
-          - samples/server/petstore/jaxrs/jersey3
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: 11
-      - name: Cache maven dependencies
-        uses: actions/cache@v3
-        env:
-          cache-name: maven-repository
-        with:
-          path: |
-            ~/.m2
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: mvn clean package

.github/workflows/samples-jaxrs.yaml

@@ -26,6 +26,8 @@ jobs:
           - samples/server/petstore/jaxrs-spec
           - samples/server/petstore/jaxrs-spec-interface
           - samples/server/petstore/jaxrs-spec-interface-response
+          - samples/server/petstore/jaxrs/jersey1
+          - samples/server/petstore/jaxrs/jersey1-useTags
           - samples/server/petstore/jaxrs-datelib-j8
           - samples/server/petstore/jaxrs-resteasy/default
           - samples/server/petstore/jaxrs-resteasy/eap
@@ -38,7 +40,7 @@ jobs:
           - samples/server/petstore/jaxrs-cxf-non-spring-app
           - samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

.github/workflows/samples-jdk17.yaml

@@ -45,7 +45,7 @@ jobs:
           - samples/client/petstore/spring-http-interface-reactive
           - samples/client/petstore/spring-http-interface
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

.github/workflows/samples-julia.yaml

@@ -15,7 +15,7 @@ jobs:
     name: Tests Julia
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: julia-actions/setup-julia@v1
         with:
           version: 1.8

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

@@ -65,7 +65,7 @@ jobs:
           - samples/client/petstore/kotlin-name-parameter-mappings
           - samples/client/others/kotlin-jvm-okhttp-parameter-tests
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

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

@@ -28,7 +28,7 @@ jobs:
           # comment out due to gradle build failure
           # - samples/server/petstore/kotlin-spring-default/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

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

@@ -43,7 +43,7 @@ jobs:
           # no build.gradle file
           #- samples/server/petstore/kotlin-vertx-modelMutable
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

.github/workflows/samples-php7.yaml

@@ -18,7 +18,7 @@ jobs:
           # servers
           - samples/server/petstore/php-laravel/lib/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Setup PHP with tools
         uses: shivammathur/setup-php@v2
         with:

.github/workflows/samples-php8.yaml

@@ -18,7 +18,7 @@ jobs:
           # servers
           - samples/server/petstore/php-symfony/SymfonyBundle-php/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Setup PHP with tools
         uses: shivammathur/setup-php@v2
         with:

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

@@ -1,44 +0,0 @@
-name: Python Client (Echo API)
-
-on:
-  pull_request:
-    paths:
-      - samples/client/echo_api/python/**
-      - .github/workflows/samples-python-client-echo-api.yaml
-jobs:
-  build:
-    name: Test Python client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/client/echo_api/python
-          - samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true
-        python-version:
-          - "3.7"
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Setup node.js
-        uses: actions/setup-node@v4
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && npm install && npm start &)
-      - name: Install 
-        working-directory: ${{ matrix.sample }}
-        run: |
-          pip install -r requirements.txt
-          pip install -r test-requirements.txt
-
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: python -m pytest

.github/workflows/samples-python-nextgen-client-echo-api.yaml

@@ -0,0 +1,38 @@
+name: Python Client (Echo API)
+
+on:
+  push:
+    paths:
+      - samples/client/echo_api/python/**
+  pull_request:
+    paths:
+      - samples/client/echo_api/python/**
+jobs:
+  build:
+    name: Test Python client
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/echo_api/python
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.7'
+      - name: Setup node.js
+        uses: actions/setup-node@v3
+      - name: Run echo server
+        run: |
+          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
+          (cd http-echo-server && npm install && npm start &)
+      - name: Install 
+        working-directory: ${{ matrix.sample }}
+        run: |
+          pip install -r requirements.txt
+          pip install -r test-requirements.txt
+      - name: Test
+        working-directory: ${{ matrix.sample }}
+        run: python -m pytest

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

@@ -1,59 +0,0 @@
-name: "Python Client: Petstore"
-
-on:
-  pull_request:
-    paths:
-      - samples/openapi3/client/petstore/python-aiohttp/**
-      - samples/openapi3/client/petstore/python/**
-      - .github/workflows/samples-python-petstore.yaml
-
-jobs:
-  build:
-    name: Test Python client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-          - "3.7"
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-        sample:
-          - samples/openapi3/client/petstore/python-aiohttp
-          - samples/openapi3/client/petstore/python
-    services:
-      petstore-api:
-        image: swaggerapi/petstore
-        ports:
-          - 80:8080
-        env:
-          SWAGGER_HOST: http://petstore.swagger.io
-          SWAGGER_BASE_PATH: /v2
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        id: py
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Cache
-        uses: actions/cache@v3
-        with:
-          key: ${{ runner.os }}-python-${{ steps.py.outputs.python-version }}-
-          path: |
-            ~/.cache/pypoetry/virtualenvs/
-            ~/.local/pipx/venvs/poetry/
-            .mypy_cache/
-
-      - name: Install poetry
-        run: pipx install --python '${{ steps.py.outputs.python-path }}' poetry
-
-      - name: Install
-        working-directory: ${{ matrix.sample }}
-        run: poetry install
-
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: poetry run pytest -v

.github/workflows/samples-python-pydantic-v1-client-echo-api.yaml

@@ -1,44 +0,0 @@
-name: Python Client pydantic v1 (Echo API)
-
-on:
-  pull_request:
-    paths:
-      - samples/client/echo_api/python-pydantic-v1/**
-      - .github/workflows/samples-python-pydantic-v1-client-echo-api.yaml
-
-jobs:
-  build:
-    name: Test Python client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/client/echo_api/python-pydantic-v1/
-        python-version:
-          - "3.7"
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Setup node.js
-        uses: actions/setup-node@v4
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && npm install && npm start &)
-      - name: Install 
-        working-directory: ${{ matrix.sample }}
-        run: |
-          pip install -r requirements.txt
-          pip install -r test-requirements.txt
-
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: python -m pytest

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

@@ -1,59 +0,0 @@
-name: "Python Client pydantic v1: Petstore"
-
-on:
-  pull_request:
-    paths:
-      - samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/**
-      - samples/openapi3/client/petstore/python-pydantic-v1/**
-      - .github/workflows/samples-python-pydantic-v1-petstore.yaml
-
-jobs:
-  build:
-    name: Test Python client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-          - "3.7"
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-        sample:
-          - samples/openapi3/client/petstore/python-pydantic-v1-aiohttp
-          - samples/openapi3/client/petstore/python-pydantic-v1
-    services:
-      petstore-api:
-        image: swaggerapi/petstore
-        ports:
-          - 80:8080
-        env:
-          SWAGGER_HOST: http://petstore.swagger.io
-          SWAGGER_BASE_PATH: /v2
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        id: py
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Cache
-        uses: actions/cache@v3
-        with:
-          key: ${{ runner.os }}-python-${{ steps.py.outputs.python-version }}-
-          path: |
-            ~/.cache/pypoetry/virtualenvs/
-            ~/.local/pipx/venvs/poetry/
-            .mypy_cache/
-
-      - name: Install poetry
-        run: pipx install --python '${{ steps.py.outputs.python-path }}' poetry
-
-      - name: Install
-        working-directory: ${{ matrix.sample }}
-        run: poetry install
-
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: poetry run pytest -v

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

@@ -18,7 +18,7 @@ jobs:
           # servers
           - samples/server/petstore/python-aiohttp/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: '3.7'

.github/workflows/samples-rust.yaml

@@ -25,7 +25,7 @@ jobs:
           - samples/client/petstore/rust/
           - samples/server/petstore/rust-server/
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable

.github/workflows/samples-scala.yaml

@@ -31,7 +31,7 @@ jobs:
           - samples/server/petstore/scalatra
           - samples/server/petstore/scala-finch # cannot be tested with jdk11
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

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

@@ -18,7 +18,7 @@ jobs:
           # clients
           - samples/openapi3/client/petstore/spring-cloud-3-with-optional
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

.github/workflows/samples-spring.yaml

@@ -3,16 +3,10 @@ name: Samples Java Spring
 on:
   push:
     paths:
-      # clients
-      - 'samples/client/petstore/spring*/**'
-      # servers
       - 'samples/server/petstore/spring*/**'
       - 'samples/openapi3/server/petstore/spring*/**'
   pull_request:
     paths:
-      # clients
-      - 'samples/client/petstore/spring*/**'
-      # servers
       - 'samples/server/petstore/spring*/**'
       - 'samples/openapi3/server/petstore/spring*/**'
 jobs:
@@ -33,7 +27,6 @@ jobs:
           - samples/openapi3/client/petstore/spring-cloud-async
           - samples/openapi3/client/petstore/spring-cloud-spring-pageable
           - samples/client/petstore/spring-cloud-tags
-          - samples/client/petstore/spring-cloud-deprecated
           # servers
           - samples/server/petstore/springboot
           - samples/openapi3/server/petstore/springboot
@@ -55,9 +48,8 @@ jobs:
           - samples/server/petstore/springboot-spring-pageable-delegatePattern
           - samples/server/petstore/springboot-spring-pageable-without-j8
           - samples/server/petstore/springboot-spring-pageable
-          - samples/server/petstore/springboot-spring-provide-args
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

.github/workflows/samples-swift.yaml

@@ -40,7 +40,7 @@ jobs:
     name: Build Swift samples
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: swift-actions/setup-swift@v1
         if: ${{ matrix.os == 'ubuntu-latest' }}
         with:

.github/workflows/samples-typescript-axios-echo-api.yaml

@@ -1,42 +0,0 @@
-name: TypeScript Axios Client (Echo API)
-
-on:
-  pull_request:
-    paths:
-      - samples/client/echo_api/typescript-axios/**
-      - .github/workflows/samples-typescript-axios-echo-api.yaml
-jobs:
-  build:
-    name: Test TypeScript Axios client
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # clients
-          - samples/client/echo_api/typescript-axios/test
-        node-version:
-          - 16
-          - 18
-          - 20
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Run echo server
-        run: |
-          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
-          (cd http-echo-server && npm install && npm start &)
-
-      - name: Install
-        working-directory: ${{ matrix.sample }}
-        run: |
-          npm run preinstall
-          npm i
-
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: npm test

.github/workflows/samples-zapier.yaml

@@ -18,9 +18,9 @@ jobs:
         sample:
           - samples/client/petstore/zapier
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Setup node
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v3
     - name: Install dependencies
       working-directory: ${{ matrix.sample }}
       run: |

.github/workflows/sonar.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'OpenAPITools' }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:

.github/workflows/windows.yaml

@@ -18,7 +18,7 @@ jobs:
       matrix:
         java: [11, 17]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v3
         with:
@@ -39,7 +39,7 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.10.0
+        uses: s4u/setup-maven-action@v1.9.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8

.gitignore

@@ -89,7 +89,7 @@ samples/client/petstore/cpp-restsdk/cmake_install.cmake
 **/.gradle
 samples/client/petstore/java/hello.txt
 samples/client/petstore/java/okhttp-gson/hello.txt
-samples/client/petstore/java/okhttp-gson-3.1/hello.txt
+samples/client/petstore/java/jersey1/hello.txt
 samples/client/petstore/java/jersey2-java8/hello.txt
 samples/client/petstore/java/jersey2/hello.txt
 samples/client/petstore/android/default/hello.txt
@@ -183,7 +183,6 @@ samples/client/petstore/python-asyncio/.pytest_cache/
 
 # PHP
 samples/client/petstore/php/OpenAPIClient-php/composer.lock
-samples/client/petstore/php-nextgen/OpenAPIClient-php/composer.lock
 samples/client/petstore/php-dt/composer.lock
 samples/client/petstore/php-dt-modern/composer.lock
 samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/composer.lock
@@ -211,7 +210,6 @@ samples/server/petstore/kotlin-server/ktor/build
 samples/server/petstore/kotlin-springboot/build
 samples/client/petstore/kotlin*/src/main/kotlin/test/
 samples/client/petstore/kotlin*/build/
-samples/server/others/kotlin-server/jaxrs-spec/build/
 
 # haskell
 .stack-work
@@ -271,7 +269,6 @@ samples/client/petstore/c/*.so
 # Ruby
 samples/openapi3/client/petstore/ruby/Gemfile.lock
 samples/openapi3/client/petstore/ruby-faraday/Gemfile.lock
-samples/openapi3/client/petstore/ruby-httpx/Gemfile.lock
 
 # Crystal
 samples/client/petstore/crystal/lib

.java-version

@@ -1 +1 @@
-11
+1.8

README.md

@@ -9,13 +9,13 @@
 [![Join the Slack chat room](https://img.shields.io/badge/Slack-Join%20the%20chat%20room-orange)](https://join.slack.com/t/openapi-generator/shared_invite/zt-12jxxd7p2-XUeQM~4pzsU9x~eGLQqX2g)
 [![Follow OpenAPI Generator Twitter account to get the latest update](https://img.shields.io/twitter/follow/oas_generator.svg?style=social&label=Follow)](https://twitter.com/oas_generator)
 [![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/OpenAPITools/openapi-generator)
-[![Conan Center](https://shields.io/conan/v/openapi-generator)](https://conan.io/center/recipes/openapi-generator)
-[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.openapi-generator.tech/scans)
+[![Conan Center](https://shields.io/conan/v/openapi-generator)](https://conan.io/center/openapi-generator)
+[![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.openapi-generator.tech/scans)
 </div>
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.1.0`):
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.0.1`):
 [![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)
 [![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)
@@ -60,29 +60,24 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [<img src="https://openapi-generator.tech/img/companies/finbourne.png" width="128" height="128">](https://www.finbourne.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/bumpsh.png" width="128" height="128">](https://bump.sh/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/bileto.png" width="128" height="128">](https://www.bileto.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/bairesdev.png" width="128" height="128">](https://www.bairesdev.com/sponsoring-open-source-projects/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/dmtech.jpeg" width="128" height="128">](https://www.dm-jobs.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/adyen.png" width="128" height="128">](https://adyen.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/fornex.png" width="128" height="128">](https://fornex.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 
-#### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS, Checkly for sponsoring the API monitoring and Gradle for sponsoring Develocity
+#### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS and Checkly for sponsoring the API monitoring
 
 [<img src="https://openapi-generator.tech/img/companies/godaddy.png" width="150">](https://www.godaddy.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [![Linode](https://www.linode.com/media/images/logos/standard/light/linode-logo_standard_light_small.png)](https://www.linode.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcRAhEYadUyZYzGUotZiSdXkVMqqLGuohyixLl4eUpUV6pAbUULL" width="150">](https://checklyhq.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/cb/Gradle_logo.png/320px-Gradle_logo.png" width="150">](https://gradle.org?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+
 
 ## Overview
-
 OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs,  documentation and configuration automatically given an [OpenAPI Spec](https://github.com/OAI/OpenAPI-Specification) (both 2.0 and 3.0 are supported). Currently, the following languages/frameworks are supported:
 
 |                                  | Languages/Frameworks                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | -------------------------------- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient 4.x, Apache HttpClient 5.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **Jetbrains HTTP Client**, **Julia**, **k6**, **Kotlin**, **Lua**, **N4JS**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (9.x - 16.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs), **XoJo**, **Zapier** |
+| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient 4.x, Apache HttpClient 5.x, Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **Jetbrains HTTP Client**, **Julia**, **k6**, **Kotlin**, **Lua**, **N4JS**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (9.x - 16.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs), **XoJo**, **Zapier** |
 | **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/), [Helidon](https://helidon.io/)), **Julia**, **Kotlin** (Spring Boot, [Ktor](https://github.com/ktorio/ktor), [Vert.x](https://vertx.io/)), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** ([rust-server](https://openapi-generator.tech/docs/generators/rust-server/)), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)                                                                                                                                                                                                                                               |
 | **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
 | **Configuration files**          | [**Apache2**](https://httpd.apache.org/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Postman Collection**, **Protocol Buffer**, **WSDL**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**, **WSDL**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 
 ## Table of contents
 
@@ -120,13 +115,13 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 7.1.0 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.1.0-SNAPSHOT/) | 18.10.2023   | Minor release with breaking changes (with fallback) |
-| [7.0.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.0.1) (latest stable release)                                                    | 18.09.2023   | Patch release (enhancements, bug fixes, etc) |
+| 7.0.1 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.0.1-SNAPSHOT/) | 08.09.2023   | Patch release (enhancements, bug fixes, etc)      |
+| [7.0.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.0.0) (latest stable release)                                                    | 25.08.2023   | Major release with breaking changes (no 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)                       |
 
-OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0, 3.1 (beta support)
+OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0
 
 (We do not publish daily/nightly build. Please use SNAPSHOT instead)
 
@@ -184,16 +179,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.0.1/openapi-generator-cli-7.0.1.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.0/openapi-generator-cli-7.0.0.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.1/openapi-generator-cli-7.0.1.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.0/openapi-generator-cli-7.0.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.0.1/openapi-generator-cli-7.0.1.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.0/openapi-generator-cli-7.0.0.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -428,7 +423,7 @@ openapi-generator-cli version
 To use a specific version of "openapi-generator-cli"
 
 ```sh
-openapi-generator-cli version-manager set 7.0.1
+openapi-generator-cli version-manager set 7.0.0
 ```
 
 Or install it as dev-dependency:
@@ -452,7 +447,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.0.1/openapi-generator-cli-7.0.1.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.0/openapi-generator-cli-7.0.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`
@@ -694,7 +689,6 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [RedHat](https://www.redhat.com)
 - [RepreZen API Studio](https://www.reprezen.com/swagger-openapi-code-generation-api-first-microservices-enterprise-development)
 - [REST United](https://restunited.com)
-- [Robocorp](https://www.robocorp.com)
 - [Robotinfra](https://www.robotinfra.com)
 - [SmartHR](https://smarthr.co.jp/)
 - [Sony Interactive Entertainment](https://www.sie.com/en/index.html)
@@ -934,9 +928,12 @@ OpenAPI Generator core team members are contributors who have been making signif
 * [@cbornet](https://github.com/cbornet) (2016/05)
 * [@jmini](https://github.com/jmini) (2018/04)  [:heart:](https://www.patreon.com/jmini)
 * [@etherealjoy](https://github.com/etherealjoy) (2019/06)
+* [@spacether](https://github.com/spacether) (2020/05) [:heart:][spacether sponsorship]
 
 :heart: = Link to support the contributor directly
 
+[spacether sponsorship]: https://github.com/sponsors/spacether/
+
 #### Template Creator
 
 **NOTE**: Embedded templates are only supported in _Mustache_ format. Support for all other formats is experimental and subject to change at any time.
@@ -1007,10 +1004,8 @@ Here is a list of template creators:
    * PowerShell (refactored in 5.0.0): @wing328
    * Python: @spacether [:heart:][spacether sponsorship]
    * Python-Experimental: @spacether [:heart:][spacether sponsorship]
-   * Python (refactored in 7.0.0): @wing328
    * R: @ramnov
    * Ruby (Faraday): @meganemura @dkliban
-   * Ruby (HTTPX): @honeyryderchuck
    * Rust: @farcaller
    * Rust (rust-server): @metaswitch
    * Scala (scalaz & http4s): @tbrown1979
@@ -1173,7 +1168,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Perl                  | @wing328 (2017/07) [:heart:](https://www.patreon.com/wing328) @yue9944882 (2019/06)                                                                                                                                                                   |
 | PHP                   | @jebentier (2017/07), @dkarlovi (2017/07), @mandrean (2017/08), @jfastnacht (2017/09), [@ybelenko](https://github.com/ybelenko) (2018/07), @renepardon (2018/12)                                                                                      |
 | PowerShell            | @wing328 (2020/05)                                                                                                                                                                                                                                    |
-| Python                | @cbornet (2017/09) @tomplus (2018/10) @krjakbrjak (2023/02) @fa0311 (2023/10) @multani (2023/10) |
+| Python                | @spacether (2019/11) [:heart:][spacether sponsorship] @krjakbrjak (2023/02)                                                                                                                                                                                                 |
 | R                     | @Ramanth (2019/07) @saigiridhar21 (2019/07)                                                                                                                                                                                                           |
 | Ruby                  | @cliffano (2017/07) @zlx (2017/09) @autopp (2019/02)                                                                                                                                                                                                  |
 | Rust                  | @frol (2017/07) @farcaller (2017/08) @richardwhiuk (2019/07) @paladinzh (2020/05) @jacob-pro (2022/10)                                                                                                                                                |
@@ -1266,3 +1261,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 ---
+

appveyor.yml

@@ -13,7 +13,7 @@ install:
   - 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
+  - ps: Install-Module -Name Pester -Force -Scope CurrentUser
 build_script:
   - dotnet --info
   # build C# aspnetcore 5.0 server

bin/configs/csharp-generichost-latest-nrt-useSourceGeneration.yaml

@@ -1,12 +0,0 @@
-# for csharp generichost
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useSourceGeneration: true
-  packageName: UseSourceGeneration

bin/configs/go-echo-api.yaml

@@ -1,6 +0,0 @@
-generatorName: go
-outputDir: samples/client/echo_api/go
-inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
-templateDir: modules/openapi-generator/src/main/resources/go
-additionalProperties:
-  hideGenerationTimestamp: "true"

bin/configs/go-petstore-generateMarshalJSON-false.yaml

@@ -1,9 +0,0 @@
-generatorName: go
-outputDir: samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-addpet-only.yaml
-templateDir: modules/openapi-generator/src/main/resources/go
-additionalProperties:
-  enumClassPrefix: "true"
-  packageName: petstore
-  disallowAdditionalPropertiesIfNotPresent: false
-  generateMarshalJSON: false

bin/configs/java-jersey1.yaml

@@ -0,0 +1,8 @@
+generatorName: java
+outputDir: samples/client/petstore/java/jersey1
+library: jersey1
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  artifactId: petstore-java-client-jersey1

bin/configs/java-okhttp-gson-3.1.yaml

@@ -1,16 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/okhttp-gson-3.1
-library: okhttp-gson
-inputSpec: modules/openapi-generator/src/test/resources/3_1/java/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-nameMappings:
-  _type: underscoreType
-  type_: typeWithUnderscore
-parameterNameMappings:
-  _type: underscoreType
-  type_: typeWithUnderscore
-additionalProperties:
-  artifactId: petstore-okhttp-gson-31
-  hideGenerationTimestamp: "true"
-  useOneOfDiscriminatorLookup: "true"
-  disallowAdditionalPropertiesIfNotPresent: false

bin/configs/java-okhttp-gson-oneOf.yaml

@@ -1,7 +0,0 @@
-generatorName: java
-outputDir: samples/client/others/java/okhttp-gson-oneOf
-library: okhttp-gson
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf_twoPrimitives.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  hideGenerationTimestamp: "true"

bin/configs/java-resttemplate-useAbstractionForFiles.yaml

@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/others/java/resttemplate-useAbstractionForFiles
-library: resttemplate 
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue13146_file_abstraction_response.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: file-resttemplate
-  hideGenerationTimestamp: "true"
-  useAbstractionForFiles: true

bin/configs/java-undertow-server-java-undertow.yaml

@@ -0,0 +1,6 @@
+generatorName: java-undertow-server
+outputDir: samples/server/petstore/java-undertow
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/java-undertow-server
+additionalProperties:
+  hideGenerationTimestamp: "true"

bin/configs/java-undertow-server.yaml

@@ -1,6 +0,0 @@
-generatorName: java-undertow-server
-outputDir: samples/server/petstore/java-undertow
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/java-undertow-server
-additionalProperties:
-  hideGenerationTimestamp: "true"

bin/configs/java-webclient-useAbstractionForFiles.yaml

@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/others/java/webclient-useAbstractionForFiles
-library: webclient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue13146_file_abstraction_response.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: file-webclient
-  hideGenerationTimestamp: "true"
-  useAbstractionForFiles: true

bin/configs/jaxrs-jersey-jersey1-useTags.yaml

@@ -0,0 +1,10 @@
+generatorName: jaxrs-jersey
+outputDir: samples/server/petstore/jaxrs/jersey1-useTags
+library: jersey1
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS
+additionalProperties:
+  artifactId: jaxrs-jersey1-useTags
+  hideGenerationTimestamp: "true"
+  serverPort: "8082"
+  useTags: "true"

bin/configs/jaxrs-jersey-jersey1.yaml

@@ -0,0 +1,9 @@
+generatorName: jaxrs-jersey
+outputDir: samples/server/petstore/jaxrs/jersey1
+library: jersey1
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS
+additionalProperties:
+  artifactId: jaxrs-jersey1-server
+  hideGenerationTimestamp: "true"
+  serverPort: "8082"

bin/configs/jaxrs-jersey-jersey3.yaml

@@ -1,9 +0,0 @@
-generatorName: jaxrs-jersey
-outputDir: samples/server/petstore/jaxrs/jersey3
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS
-library: jersey3
-additionalProperties:
-  artifactId: jaxrs-jersey3-petstore-server
-  hideGenerationTimestamp: "true"
-  serverPort: "8082"

bin/configs/lua.yaml

@@ -4,5 +4,3 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/lua
 additionalProperties:
   packageName: petstore
-nameMappings:
-  phone: mobile

bin/configs/perl.yaml

@@ -4,7 +4,3 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/perl
 additionalProperties:
   hideGenerationTimestamp: "true"
-nameMappings:
-  NullableMessage: system_message
-modelNameMappings:
-  DeprecatedObject: DeprecatedModel

bin/configs/php-nextgen-echo-api.yaml

@@ -1,6 +0,0 @@
-generatorName: php-nextgen
-outputDir: samples/client/echo_api/php-nextgen
-inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-nextgen
-additionalProperties:
-  hideGenerationTimestamp: "true"

bin/configs/php-nextgen.yaml

@@ -1,4 +0,0 @@
-generatorName: php-nextgen
-outputDir: samples/client/petstore/php-nextgen/OpenAPIClient-php
-inputSpec: modules/openapi-generator/src/test/resources/3_0/php-nextgen/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-nextgen

bin/configs/powershell-echo-api.yaml

@@ -1,7 +0,0 @@
-generatorName: powershell
-outputDir: samples/client/echo_api/powershell
-inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
-templateDir: modules/openapi-generator/src/main/resources/powershell
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  packageGuid: a27b908d-2a20-467f-bc32-af6f3a654ac5

bin/configs/powershell.yaml

@@ -14,7 +14,3 @@ additionalProperties:
   projectUri: https://github.com/OpenAPITools/openapi-generator
   releaseNotes: 'This is a sample project'
   tags: 'PetStore,powershell,sdk'
-nameMappings:
-  name_mapping: SomethingElse
-modelNameMappings:
-  model-mapping: NewModel

bin/configs/python-echo-api-disallowAdditionalPropertiesIfNotPresent-true.yaml

@@ -1,7 +0,0 @@
-generatorName: python
-outputDir: samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true
-inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
-templateDir: modules/openapi-generator/src/main/resources/python
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  disallowAdditionalPropertiesIfNotPresent: "true"

bin/configs/python-flask.yaml

@@ -1,4 +1,4 @@
 generatorName: python-flask
 outputDir: samples/server/petstore/python-flask
-inputSpec: modules/openapi-generator/src/test/resources/2_0/python-flask/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/python-flask

bin/configs/python-pydantic-v1-aiohttp.yaml

@@ -1,8 +0,0 @@
-generatorName: python-pydantic-v1
-outputDir: samples/openapi3/client/petstore/python-pydantic-v1-aiohttp
-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-pydantic-v1
-library: asyncio
-additionalProperties:
-  packageName: petstore_api
-  mapNumberTo: float

bin/configs/python-pydantic-v1-echo-api.yaml

@@ -1,6 +0,0 @@
-generatorName: python-pydantic-v1
-outputDir: samples/client/echo_api/python-pydantic-v1
-inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-pydantic-v1
-additionalProperties:
-  hideGenerationTimestamp: "true"

bin/configs/python-pydantic-v1.yaml

@@ -1,12 +0,0 @@
-generatorName: python-pydantic-v1
-outputDir: samples/openapi3/client/petstore/python-pydantic-v1
-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-pydantic-v1
-additionalProperties:
-  packageName: petstore_api
-  useOneOfDiscriminatorLookup: "true"
-  disallowAdditionalPropertiesIfNotPresent: false
-  mapNumberTo: StrictFloat
-nameMappings:
-  _type: underscore_type
-  type_: type_with_underscore

bin/configs/ruby-httpx-echo-api.yaml

@@ -1,7 +0,0 @@
-generatorName: ruby
-outputDir: samples/client/echo_api/ruby-httpx
-inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-client
-library: httpx
-additionalProperties:
-  hideGenerationTimestamp: "true"

bin/configs/ruby-httpx.yaml

@@ -1,10 +0,0 @@
-generatorName: ruby
-outputDir: samples/client/petstore/ruby-httpx
-library: httpx
-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
-  moduleName: Petstore
-  gemName: petstore
-  skipFormModel: "true"

bin/configs/spring-cloud-deprecated-oas3.yaml

@@ -1,13 +0,0 @@
-generatorName: spring
-library: spring-cloud
-outputDir: samples/client/petstore/spring-cloud-deprecated
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-deprecated-fields.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  groupId: org.openapitools.openapi3
-  documentationProvider: springdoc
-  artifactId: spring-cloud-deprecated
-  interfaceOnly: "true"
-  singleContentTypes: "true"
-  hideGenerationTimestamp: "true"
-  useTags: "true"

bin/configs/springboot-petstore-server-spring-provide-args.yaml

@@ -1,8 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/springboot-spring-provide-args
-library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-spring-provide-args.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  artifactId: springboot-spring-provide-args
-  hideGenerationTimestamp: 'true'

bin/configs/typescript-axios-echo-api.yaml

@@ -1,9 +0,0 @@
-generatorName: typescript-axios
-outputDir: samples/client/echo_api/typescript-axios/build
-inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
-additionalProperties:
-  artifactId: echo-api-typescript-axios
-  hideGenerationTimestamp: "true"
-  npmVersion: 1.0.0
-  npmName: '@openapitools/typescript-axios-echo-api'

bin/generate-samples.sh

@@ -53,7 +53,7 @@ if [[ ${#files[@]} -eq 1 && "${files[0]}" != *'*'* ]]; then
     java ${JAVA_OPTS} -jar "$executable" generate -c ${files[0]} ${args[@]}
 else
     echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
-    #sleep 5
+    sleep 5
     if [ ${#files[@]} -eq 0 ]; then
       files=("${root}"/bin/configs/*.yaml)
     fi

bin/utils/test_file_list.yaml

@@ -9,9 +9,3 @@
 # java okhttp gson test files
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java"
   sha256: db505f7801fef62c13a08a8e9ca1fc4c5c947ab46b46f12943139d353feacf17
-- filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java"
-  sha256: 6db714e9744c150c8982c3cb18e4f37a9c1ecd8f72f6d58943986e781ab4a344
-- filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java"
-  sha256: 0d64cdc11809a7b5b952ccdad2bd91bd0045b3894d6fabf3e368fa0be12b8217
-- filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java"
-  sha256: a1f8a70bf7b0c382a8def5bacf7b1fb189e687fabb40235aa799001e0597f545

docs/configuration.md

@@ -78,7 +78,7 @@ Suppose you want to apply snake case naming to mysql schema outputs. Your config
 **CLI**
 
 ```
-openapi-generator -g mysql-schema -o out -i spec.yaml --additional-properties=identifierNamingConvention=snake_case,useSingleRequestParameter=true,withInterfaces=true
+openapi-generator -g mysql-schema -o out -i spec.yaml --additional-properties=identifierNamingConvention=snake_case
 ```
 
 It may seem like a typo but there are two `=` signs in the above example.

docs/customization.md

@@ -318,6 +318,7 @@ CONFIG OPTIONS
 ...... (results omitted)
 	library
 	    library template (sub-template) to use:
+	    jersey1 - HTTP client: Jersey client 1.18. JSON processing: Jackson 2.4.2
 	    jersey2 - HTTP client: Jersey client 2.6
 	    feign - HTTP client: Netflix Feign 8.1.1.  JSON processing: Jackson 2.6.3
 	    okhttp-gson (default) - HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1

docs/generators.md

@@ -50,10 +50,8 @@ The following generators are available:
 * [perl](generators/perl.md)  
 * [php](generators/php.md)  
 * [php-dt (beta)](generators/php-dt.md)  
-* [php-nextgen (beta)](generators/php-nextgen.md)  
 * [powershell (beta)](generators/powershell.md)  
 * [python](generators/python.md)  
-* [python-pydantic-v1](generators/python-pydantic-v1.md)  
 * [r](generators/r.md)  
 * [ruby](generators/ruby.md)  
 * [rust](generators/rust.md)  

docs/generators/aspnetcore.md

@@ -116,9 +116,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <ul class="column-ul">
 <li>Client</li>
 <li>Configuration</li>
-<li>Environment</li>
-<li>OperatingSystem</li>
-<li>TimeZone</li>
 <li>Version</li>
 <li>abstract</li>
 <li>as</li>

docs/generators/csharp-functions.md

@@ -109,9 +109,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <ul class="column-ul">
 <li>Client</li>
 <li>Configuration</li>
-<li>Environment</li>
-<li>OperatingSystem</li>
-<li>TimeZone</li>
 <li>Version</li>
 <li>abstract</li>
 <li>as</li>

docs/generators/csharp.md

@@ -49,7 +49,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
 |useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
 |useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped.| |false|
-|useSourceGeneration|Use source generation where available (only `generichost` library supports this option).| |false|
 |validatable|Generates self-validatable models.| |true|
 |zeroBasedEnums|Enumerations with string values will start from 0 when true, 1 when false. If not set, enumerations with string values will start from 0 if the first value is 'unknown', case insensitive.| |null|
 
@@ -115,9 +114,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <ul class="column-ul">
 <li>Client</li>
 <li>Configuration</li>
-<li>Environment</li>
-<li>OperatingSystem</li>
-<li>TimeZone</li>
 <li>Version</li>
 <li>abstract</li>
 <li>as</li>

docs/generators/go.md

@@ -21,7 +21,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |enumClassPrefix|Prefix enum with class name| |false|
 |generateInterfaces|Generate interfaces for api classes| |false|
-|generateMarshalJSON|Generate MarshalJSON method| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |isGoSubmodule|whether the generated Go module is a submodule| |false|
 |packageName|Go package name (convention: lowercase).| |openapi|
@@ -30,7 +29,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |structPrefix|whether to prefix struct with the class name. e.g. DeletePetOpts =&gt; PetApiDeletePetOpts| |false|
 |useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped.| |false|
 |withAWSV4Signature|whether to include AWS v4 signature support| |false|
-|withGoMod|Generate go.mod and go.sum| |true|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
 
 ## IMPORT MAPPING

docs/generators/java-msf4j.md

@@ -49,7 +49,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
-|library|library template (sub-template)|<dl><dt>**jersey2**</dt><dd>Jersey core 2.x</dd></dl>|jersey2|
+|library|library template (sub-template)|<dl><dt>**jersey1**</dt><dd>Jersey core 1.x</dd><dt>**jersey2**</dt><dd>Jersey core 2.x</dd></dl>|jersey2|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |org.openapitools.model|

docs/generators/java.md

@@ -57,7 +57,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null|
 |invokerPackage|root package for generated code| |org.openapitools.client|
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
-|library|library template (sub-template) to use|<dl><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x</dd><dt>**jersey3**</dt><dd>HTTP client: Jersey client 3.x. JSON processing: Jackson 2.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 10.x. JSON processing: Jackson 2.9.x. or Gson 2.x</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 1.x. JSON processing: JSON-B or Jackson 2.9.x</dd><dt>**apache-httpclient**</dt><dd>HTTP client: Apache httpclient 5.x</dd></dl>|okhttp-gson|
+|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey3' or other HTTP libraries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x</dd><dt>**jersey3**</dt><dd>HTTP client: Jersey client 3.x. JSON processing: Jackson 2.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 10.x. JSON processing: Jackson 2.9.x. or Gson 2.x</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 1.x. JSON processing: JSON-B or Jackson 2.9.x</dd><dt>**apache-httpclient**</dt><dd>HTTP client: Apache httpclient 5.x</dd></dl>|okhttp-gson|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |microprofileFramework|Framework for microprofile. Possible values &quot;kumuluzee&quot;| |null|
@@ -92,7 +92,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|
 |usePlayWS|Use Play! Async HTTP client (Play WS API)| |false|
 |useReflectionEqualsHashCode|Use org.apache.commons.lang3.builder for equals and hashCode in the models. WARNING: This will fail under a security manager, unless the appropriate permissions are set up correctly and also there's potential performance impact.| |false|
-|useRuntimeException|Use RuntimeException instead of Exception. Only jersey2, jersey3, okhttp-gson, vertx, microprofile support this option.| |false|
+|useRuntimeException|Use RuntimeException instead of Exception. Only jersey, jersey2, jersey3, okhttp-gson, vertx, microprofile support this option.| |false|
 |useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
 |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
 |useSingleRequestParameter|Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter. ONLY jersey2, jersey3, okhttp-gson support this option.| |false|

docs/generators/jaxrs-jersey.md

@@ -49,7 +49,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
-|library|library template (sub-template)|<dl><dt>**jersey2**</dt><dd>Jersey core 2.x</dd><dt>**jersey3**</dt><dd>Jersey core 3.x</dd></dl>|jersey2|
+|library|library template (sub-template)|<dl><dt>**jersey1**</dt><dd>Jersey core 1.x</dd><dt>**jersey2**</dt><dd>Jersey core 2.x</dd></dl>|jersey2|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |org.openapitools.model|
@@ -67,6 +67,7 @@ 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/gen/java|
+|supportJava6|Whether to support Java6 with the Jersey1/2 library.| |false|
 |testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
 |title|a title describing the application| |OpenAPI Server|
 |useBeanValidation|Use BeanValidation API annotations| |true|