fix additional properties any type

update template and samples
better additional properties support
2025-12-06 17:56:12 +00:00 · 2023-07-30 16:25:18 +08:00 · 2023-07-30 16:20:45 +08:00 · 2023-07-30 16:15:07 +08:00
7336 changed files with 28085 additions and 379103 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -204,8 +204,8 @@ jobs:
      - command_build_and_test:
          nodeNo: "3"
  node4:
-    machine:
-      image: ubuntu-2004:202201-02
+    docker:
+      - image: fkrull/multi-python
    working_directory: ~/OpenAPITools/openapi-generator
    shell: /bin/bash --login
    environment:
@@ -215,7 +215,7 @@ jobs:
      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
    steps:
      - checkout
-      - command_build_and_test:
+      - command_docker_build_and_test:
          nodeNo: "4"
 workflows:
  version: 2
--- a/.github/.test/samples.json
+++ b/.github/.test/samples.json
@@ -800,6 +800,12 @@
        "Client: Python"
      ]
    },
+    {
+      "input": "python-server-flask-petstore-python2.sh",
+      "matches": [
+        "Server: Python"
+      ]
+    },
    {
      "input": "python-server-flask-petstore.sh",
      "matches": [
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,7 +8,7 @@
 - [ ] 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
  ``` 
  Commit all changed files. 
@@ -16,5 +16,10 @@
  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*`. 
  For Windows users, please run the script in [Git BASH](https://gitforwindows.org/).
- [ ] 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)
+- [ ] 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` (6.3.0) (minor release - breaking changes with fallbacks), `7.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.
--- a/.github/workflows/docker.yaml
+++ b/.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
--- a/.github/workflows/gradle-plugin-tests.yaml
+++ b/.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:
--- a/.github/workflows/gradle-test.yaml
+++ b/.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'
--- a/.github/workflows/linux.yaml
+++ b/.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.9.0
+        uses: s4u/setup-maven-action@v1.8.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.9.0
+        uses: s4u/setup-maven-action@v1.8.0
        with:
          java-version: 11
          maven-version: 3.8.8
--- a/.github/workflows/maven-plugin-tests.yaml
+++ b/.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:
--- a/.github/workflows/misc-test.yaml
+++ b/.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'
--- a/.github/workflows/openapi-generator.yaml
+++ b/.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:
--- a/.github/workflows/samples-c-libcurl-client.yaml
+++ b/.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
--- a/.github/workflows/samples-cpp-qt-client.yaml
+++ b/.github/workflows/samples-cpp-qt-client.yaml
@@ -28,7 +28,7 @@ jobs:
            tools: 'tools_openssl_x64'
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: jurplel/install-qt-action@v3
        with:
          version: ${{ matrix.qt-version }}
--- a/.github/workflows/samples-dart.yaml
+++ b/.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'
--- a/.github/workflows/samples-dotnet-standard.yaml
+++ b/.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.*
--- a/.github/workflows/samples-dotnet.yaml
+++ b/.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'
--- a/.github/workflows/samples-dotnet6-client-echo-api.yaml
+++ b/.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'
--- a/.github/workflows/samples-dotnet6-client.yaml
+++ b/.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'
--- a/.github/workflows/samples-dotnet6-server.yaml
+++ b/.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'
--- a/.github/workflows/samples-elm.yaml
+++ b/.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
--- a/.github/workflows/samples-erlang.yaml
+++ b/.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'
--- a/.github/workflows/samples-go.yaml
+++ b/.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"
--- a/.github/workflows/samples-groovy.yaml
+++ b/.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'
--- a/.github/workflows/samples-haskell.yaml
+++ b/.github/workflows/samples-haskell.yaml
@@ -1,36 +0,0 @@
-name: Samples Haskell
-
-on:
-  push:
-    paths:
-      - samples/server/petstore/haskell-yesod/**
-      - samples/server/petstore/haskell-servant/**
-      - samples/client/petstore/haskell-http-client/**
-  pull_request:
-    paths:
-      - samples/server/petstore/haskell-yesod/**
-      - samples/server/petstore/haskell-servant/**
-      - samples/client/petstore/haskell-http-client/**
-jobs:
-  build:
-    name: Build stack projects
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sample:
-          # servers
-          - samples/server/petstore/haskell-yesod/
-          - samples/server/petstore/haskell-servant/
-          - samples/client/petstore/haskell-http-client/
-    steps:
-      - uses: actions/checkout@v4
-      - uses: haskell/actions/setup@v2
-        with:
-          # ghc-version: '8.8.4' # Exact version of ghc to use
-          # cabal-version: 'latest'. Omitted, but defaults to 'latest'
-          enable-stack: true
-          stack-version: 'latest'
-      - name: stack test
-        working-directory: ${{ matrix.sample }}
-        run: stack test
--- a/.github/workflows/samples-java-client-echo-api-jdk11.yaml
+++ b/.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'
--- a/.github/workflows/samples-java-client-echo-api-jdk8.yaml
+++ b/.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'
--- a/.github/workflows/samples-java-client-jdk11.yaml
+++ b/.github/workflows/samples-java-client-jdk11.yaml
@@ -43,13 +43,12 @@ 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
          - samples/client/petstore/java/microprofile-rest-client
          - samples/client/petstore/java/microprofile-rest-client-3.0
-          - samples/client/petstore/java/microprofile-rest-client-3.0-jackson
-          - 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/jersey1
@@ -62,7 +61,7 @@ jobs:
          - samples/client/petstore/java/resttemplate-swagger2/
          - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: actions/setup-java@v3
        with:
          distribution: 'temurin'
--- a/.github/workflows/samples-java-client-jdk17.yaml
+++ b/.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'
--- a/.github/workflows/samples-java-helidon.yaml
+++ b/.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'
--- a/.github/workflows/samples-java-play-framework.yaml
+++ b/.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'
--- a/.github/workflows/samples-java-server-jdk8.yaml
+++ b/.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'
--- a/.github/workflows/samples-jaxrs.yaml
+++ b/.github/workflows/samples-jaxrs.yaml
@@ -40,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'
--- a/.github/workflows/samples-jdk17.yaml
+++ b/.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'
--- a/.github/workflows/samples-julia.yaml
+++ b/.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
--- a/.github/workflows/samples-kotlin-client.yaml
+++ b/.github/workflows/samples-kotlin-client.yaml
@@ -4,11 +4,9 @@ on:
  push:
    branches:
      - 'samples/client/petstore/kotlin*/**'
-      - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'
  pull_request:
    paths:
      - 'samples/client/petstore/kotlin*/**'
-      - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'

 env:
  GRADLE_VERSION: 6.9
@@ -51,7 +49,6 @@ jobs:
          - samples/client/petstore/kotlin-array-simple-string-multiplatform
          - samples/client/petstore/kotlin-bigdecimal-default-multiplatform
          - samples/client/petstore/kotlin-bigdecimal-default-okhttp4
-          - samples/client/petstore/kotlin-jvm-jackson
          - samples/client/petstore/kotlin-jvm-ktor-jackson
          - samples/client/petstore/kotlin-jvm-ktor-gson
          - samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization
@@ -63,9 +60,8 @@ jobs:
          - samples/client/petstore/kotlin-jvm-spring-3-webclient
          - samples/client/petstore/kotlin-spring-cloud
          - 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'
--- a/.github/workflows/samples-kotlin-server-jdk17.yaml
+++ b/.github/workflows/samples-kotlin-server-jdk17.yaml
@@ -4,13 +4,9 @@ on:
  push:
    branches:
      - 'samples/server/petstore/kotlin-springboot-3*/**'
-      # comment out due to gradle build failure
-      # - samples/server/petstore/kotlin-spring-default/**
  pull_request:
    paths:
      - 'samples/server/petstore/kotlin-springboot-3*/**'
-      # comment out due to gradle build failure
-      # - samples/server/petstore/kotlin-spring-default/**

 env:
  GRADLE_VERSION: 7.4
@@ -25,10 +21,8 @@ jobs:
        sample:
          # server
          - samples/server/petstore/kotlin-springboot-3
-          # 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'
--- a/.github/workflows/samples-kotlin-server.yaml
+++ b/.github/workflows/samples-kotlin-server.yaml
@@ -3,16 +3,10 @@ name: Samples Kotlin server
 on:
  push:
    branches:
-      - samples/server/others/kotlin-server/jaxrs-spec/**
      - 'samples/server/petstore/kotlin*/**'
-      # comment out due to gradle build failure
-      #- samples/server/petstore/kotlin-spring-default/**
  pull_request:
    paths:
-      - samples/server/others/kotlin-server/jaxrs-spec/**
      - 'samples/server/petstore/kotlin*/**'
-      # comment out due to gradle build failure
-      # - samples/server/petstore/kotlin-spring-default/**

 env:
  GRADLE_VERSION: 6.9
@@ -35,15 +29,11 @@ jobs:
          - samples/server/petstore/kotlin-springboot-springfox
          - samples/server/petstore/kotlin-server/ktor
          - samples/server/petstore/kotlin-server/jaxrs-spec
-          - samples/server/petstore/kotlin-server/jaxrs-spec-mutiny
          - samples/server/petstore/kotlin-server-modelMutable
-          - samples/server/others/kotlin-server/jaxrs-spec
-          # comment out due to gradle build failure
-          #- samples/server/petstore/kotlin-spring-default
          # 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'
--- a/.github/workflows/samples-php7.yaml
+++ b/.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:
--- a/.github/workflows/samples-php8.yaml
+++ b/.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:
--- a/.github/workflows/samples-python-nextgen-client-echo-api.yaml
+++ b/.github/workflows/samples-python-nextgen-client-echo-api.yaml
@@ -18,7 +18,7 @@ jobs:
          # clients
          - samples/client/echo_api/python
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: actions/setup-python@v4
        with:
          python-version: '3.7'
--- a/.github/workflows/samples-python-server.yaml
+++ b/.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'
--- a/.github/workflows/samples-rust.yaml
+++ b/.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
--- a/.github/workflows/samples-scala.yaml
+++ b/.github/workflows/samples-scala.yaml
@@ -27,11 +27,10 @@ jobs:
          - 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
          - 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'
--- a/.github/workflows/samples-spring-jdk17.yaml
+++ b/.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'
--- a/.github/workflows/samples-spring.yaml
+++ b/.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,14 +27,12 @@ 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
          - samples/server/petstore/springboot-beanvalidation
          - samples/server/petstore/springboot-useoptional
          - samples/server/petstore/springboot-reactive
-          - samples/server/petstore/springboot-reactive-noResponseEntity
          - samples/server/petstore/springboot-implicitHeaders
          - samples/openapi3/server/petstore/springboot-implicitHeaders
          - samples/server/petstore/springboot-delegate
@@ -56,7 +48,7 @@ jobs:
          - samples/server/petstore/springboot-spring-pageable-without-j8
          - samples/server/petstore/springboot-spring-pageable
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: actions/setup-java@v3
        with:
          distribution: 'temurin'
--- a/.github/workflows/samples-swift.yaml
+++ b/.github/workflows/samples-swift.yaml
@@ -1,50 +0,0 @@
-name: Samples Swift
-
-on:
-  push:
-    paths:
-      - samples/client/petstore/swift5/**
-  pull_request:
-    paths:
-      - samples/client/petstore/swift5/**
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest]
-        sample:
-          - samples/client/petstore/swift5/alamofireLibrary
-          - samples/client/petstore/swift5/anycodableLibrary
-          - samples/client/petstore/swift5/asyncAwaitLibrary
-          - samples/client/petstore/swift5/combineLibrary
-          - samples/client/petstore/swift5/default
-          - samples/client/petstore/swift5/deprecated
-          - samples/client/petstore/swift5/frozenEnums
-          - samples/client/petstore/swift5/nonPublicApi
-          - samples/client/petstore/swift5/objcCompatible
-          - samples/client/petstore/swift5/oneOf
-          - samples/client/petstore/swift5/promisekitLibrary
-          - samples/client/petstore/swift5/readonlyProperties
-          - samples/client/petstore/swift5/resultLibrary
-          - samples/client/petstore/swift5/rxswiftLibrary
-          - samples/client/petstore/swift5/urlsessionLibrary
-          - samples/client/petstore/swift5/validation
-          # NOTE: disabled as vaporLibrary doesnt build when adding this CI config
-          #- samples/client/petstore/swift5/vaporLibrary
-          - samples/client/petstore/swift5/x-swift-hashable
-        include:
-        - os: ubuntu-latest
-          sample: samples/client/petstore/swift5/alamofireLibrary
-    name: Build Swift samples
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: swift-actions/setup-swift@v1
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        with:
-          swift-version: '5'
-      - name: Build
-        working-directory: ${{ matrix.sample }}
-        run: swift build
--- a/.github/workflows/samples-zapier.yaml
+++ b/.github/workflows/samples-zapier.yaml
@@ -18,7 +18,7 @@ jobs:
        sample:
          - samples/client/petstore/zapier
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
    - name: Setup node
      uses: actions/setup-node@v3
    - name: Install dependencies
--- a/.github/workflows/sonar.yml
+++ b/.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:
--- a/.github/workflows/windows.yaml
+++ b/.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.9.0
+        uses: s4u/setup-maven-action@v1.8.0
        with:
          java-version: ${{ matrix.java }}
          maven-version: 3.8.8
--- a/.gitignore
+++ b/.gitignore
@@ -89,7 +89,6 @@ 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
@@ -174,17 +173,17 @@ samples/client/petstore/csharp-refactor/OpenAPIClient/nuget.exe
 # Python
 *.pyc
 __pycache__
-.venv/
 samples/client/petstore/python/dev-requirements.txt.log
 samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt
 samples/client/petstore/python/.coverage
 samples/client/petstore/python/.projectile
+samples/client/petstore/python/.venv/
+samples/client/petstore/python-asyncio/.venv/
 samples/client/petstore/python-asyncio/.pytest_cache/
-
+samples/client/petstore/python-tornado/.venv/

 # 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
@@ -212,7 +211,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
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-11
+1.8
--- a/.travis.yml
+++ b/.travis.yml
@@ -136,7 +136,7 @@ script:
  # run integration tests defined in maven pom.xml
  # WARN: Travis will timeout after 10 minutes of no stdout/stderr activity, which is problematic with mvn --quiet.
  # show "error" only to reduce the log size
-  - ./mvnw -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -DskipTests -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  - ./mvnw -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -DskipTests -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error 2>&1 | grep -i error
 after_success:
  # push to maven repo
  - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
--- a/CI/circle_parallel.sh
+++ b/CI/circle_parallel.sh
@@ -9,6 +9,15 @@ set -e

 export NODE_ENV=test

+function cleanup {
+  # Show logs of 'petstore.swagger' container to troubleshoot Unit Test failures, if any.
+  if [ "$NODE_INDEX" != "4" ]; then
+    docker logs petstore.swagger # container name specified in circle.yml
+  fi
+}
+
+trap cleanup EXIT
+
 if [ "$NODE_INDEX" = "1" ]; then
  echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..."
  java -version
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@

 <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.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)
 [![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)
@@ -77,7 +77,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
 | **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

@@ -115,13 +115,12 @@ 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) |
-| [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)                                                    | 11.05.2023   | Minor release with breaking changes (with fallback) |
+| 7.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.0.0-SNAPSHOT/) | Jul/Aug 2023   | Major release with breaking changes (no fallback) |
+| [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0) (latest stable release)                                                    | 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)

@@ -179,16 +178,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/6.6.0/openapi-generator-cli-6.6.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/6.6.0/openapi-generator-cli-6.6.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/6.6.0/openapi-generator-cli-6.6.0.jar
 ```

 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -423,7 +422,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 6.6.0
 ```

 Or install it as dev-dependency:
@@ -447,7 +446,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/6.6.0/openapi-generator-cli-6.6.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`
@@ -928,9 +927,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.
@@ -1001,7 +1003,6 @@ 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
   * Rust: @farcaller
@@ -1138,7 +1139,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Bash                  | @frol (2017/07) @bkryza (2017/08) @kenjones-cisco (2017/09)                                                                                                                                                                                           |
 | C                     | @zhemant (2018/11) @ityuhui (2019/12) @michelealbano (2020/03)                                                                                                                                                                                        |
 | C++                   | @ravinikam (2017/07) @stkrwork (2017/07) @etherealjoy (2018/02) @martindelille (2018/03) @muttleyxd (2019/08)                                                                                                                                         |
-| C#                    | @mandrean (2017/08) @shibayan (2020/02) @Blackclaws (2021/03) @lucamazzanti (2021/05) @iBicha (2023/07)                                                                                                                                          |
+| C#                    | @mandrean (2017/08) @frankyjuang (2019/09) @shibayan (2020/02) @Blackclaws (2021/03) @lucamazzanti (2021/05) @iBicha (2023/07)                                                                                                                                          |
 | Clojure               |                                                                                                                                                                                                                                                       |
 | Crystal               | @cyangle (2021/01)                                                                                                                                                                                                                                    |
 | Dart                  | @jaumard (2018/09) @josh-burton (2019/12) @amondnet (2019/12) @sbu-WBT (2020/12) @kuhnroyal (2020/12) @agilob (2020/12) @ahmednfwela (2021/08)                                                                                                        |
@@ -1151,8 +1152,8 @@ If you want to join the committee, please kindly apply by sending an email to te
 | GraphQL               | @renepardon (2018/12)                                                                                                                                                                                                                                 |
 | Groovy                |                                                                                                                                                                                                                                                       |
 | Haskell               |                                                                                                                                                                                                                                                       |
-| Java                  | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @martin-mfg (2023/08)                                                                 |
-| Java Spring           | @cachescrubber (2022/02) @welshm (2022/02) @MelleD (2022/02) @atextor (2022/02) @manedev79 (2022/02) @javisst (2022/02) @borsch (2022/02) @banlevente (2022/02) @Zomzog (2022/09) @martin-mfg (2023/08)                                                                     |
+| Java                  | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10)                                                                 |
+| Java Spring           | @cachescrubber (2022/02) @welshm (2022/02) @MelleD (2022/02) @atextor (2022/02) @manedev79 (2022/02) @javisst (2022/02) @borsch (2022/02) @banlevente (2022/02) @Zomzog (2022/09)                                                                     |
 | JMeter                | @kannkyo (2021/01)                                                                                                                                                                                                                                    |
 | Jetbrains HTTP Client | @jlengrand (2023/01)                                                                                                                                                                                                                                  |
 | Julia                 | @tanmaykm (2023/01)                                                                                                                                                                                                                                   |
@@ -1166,7 +1167,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                | @krjakbrjak (2023/02)                                                                                                                                                                                                 |
+| 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)                                                                                                                                                |
@@ -1260,4 +1261,3 @@ limitations under the License.

 ---

-
--- a/bin/configs/c.yaml
+++ b/bin/configs/c.yaml
@@ -2,6 +2,3 @@ generatorName: c
 outputDir: samples/client/petstore/c
 inputSpec: modules/openapi-generator/src/test/resources/2_0/c/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/C-libcurl
-modelNameMappings:
-  another_model: MappedModel
-  another_property: mappedProperty
--- a/bin/configs/crystal.yaml
+++ b/bin/configs/crystal.yaml
@@ -7,12 +7,3 @@ additionalProperties:
  moduleName: Petstore
  shardName: petstore
 strictSpecBehavior: false
-modelNameMappings:
-  PropertyNameMapping: AnotherPropertyNameMapping
-nameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
-  type-: type_with_dash
-parameterNameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
--- a/bin/configs/csharp-generichost-latest-nrt-useSourceGeneration.yaml
+++ b/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
--- a/bin/configs/csharp-restsharp-net6.0-name-mappings.yaml
+++ b/bin/configs/csharp-restsharp-net6.0-name-mappings.yaml
@@ -10,9 +10,6 @@ parameterNameMappings:
  _type: UnderscoreType
  type_: TypeWithUnderscore
  http_debug_operation: HttpDebugOperation
-modelNameMappings:
-  Environment: Env
 additionalProperties:
  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
  hideGenerationTimestamp: "true"
-  targetFramework: net6.0
--- a/bin/configs/elixir.yaml
+++ b/bin/configs/elixir.yaml
@@ -4,10 +4,3 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/elixir
 additionalProperties:
  invokerPackage: OpenapiPetstore
-modelNameMappings:
-  DeprecatedObject: DeprecatedModel
-# the following options have no effect on elixir client gen which uses baseName
-nameMappings:
-  deprecatedRef: deprecatedReference
-parameterNameMapping:
-  ioutils: ioutils_parameter
--- a/bin/configs/go-echo-api.yaml
+++ b/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"
--- a/bin/configs/go-server-chi-api-server.yaml
+++ b/bin/configs/go-server-chi-api-server.yaml
@@ -1,6 +1,6 @@
 generatorName: go-server
 outputDir: samples/server/petstore/go-chi-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/go-server/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/go-server
 additionalProperties:
  hideGenerationTimestamp: "true"
--- a/bin/configs/go-server-chi-api-server-test.yaml
+++ b/bin/configs/go-server-chi-api-server-test.yaml
@@ -1,6 +1,6 @@
 generatorName: go-server
-outputDir: samples/openapi3/server/petstore/go/go-petstore
-inputSpec: modules/openapi-generator/src/test/resources/3_0/go-server/petstore_with_test_endpoint.yaml
+outputDir: samples/server/petstore/go-server-required
+inputSpec: modules/openapi-generator/src/test/resources/3_0/server-required.yaml
 templateDir: modules/openapi-generator/src/main/resources/go-server
 additionalProperties:
  hideGenerationTimestamp: "true"
--- a/bin/configs/haskell-servant.yaml
+++ b/bin/configs/haskell-servant.yaml
@@ -1,4 +1,4 @@
 generatorName: haskell
 outputDir: samples/server/petstore/haskell-servant
-inputSpec: modules/openapi-generator/src/test/resources/3_0/haskell/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/haskell-servant
--- a/bin/configs/haskell-yesod-petstore-new.yaml
+++ b/bin/configs/haskell-yesod-petstore-new.yaml
@@ -1,6 +1,6 @@
 generatorName: haskell-yesod
 outputDir: samples/server/petstore/haskell-yesod
-inputSpec: modules/openapi-generator/src/test/resources/3_0/haskell/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/haskell-yesod
 additionalProperties:
  hideGenerationTimestamp: "true"
--- a/bin/configs/java-microprofile-rest-client-3.0-jackson-with-xml.yaml
+++ b/bin/configs/java-microprofile-rest-client-3.0-jackson-with-xml.yaml
@@ -1,11 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml
-library: microprofile
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-withXml: true
-additionalProperties:
-  serializationLibrary: jackson
-  artifactId: microprofile-rest-client-3-jackson-with-xml
-  configKey: petstore
-  microprofileRestClientVersion: "3.0"
--- a/bin/configs/java-microprofile-rest-client-3.0-jackson.yaml
+++ b/bin/configs/java-microprofile-rest-client-3.0-jackson.yaml
@@ -1,10 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/microprofile-rest-client-3.0-jackson
-library: microprofile
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  serializationLibrary: jackson
-  artifactId: microprofile-rest-client-3-jackson
-  configKey: petstore
-  microprofileRestClientVersion: "3.0"
--- a/bin/configs/java-native-echo-api.yaml
+++ b/bin/configs/java-native-echo-api.yaml
@@ -6,8 +6,3 @@ templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
  artifactId: echo-api-native
  hideGenerationTimestamp: "true"
-
-typeMappings:
-  OffsetDateTime: "Instant"
-importMappings:
-  OffsetDateTime: "java.time.Instant"
--- a/bin/configs/java-okhttp-gson-3.1.yaml
+++ b/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
--- a/bin/configs/java-okhttp-gson-streaming.yaml
+++ b/bin/configs/java-okhttp-gson-streaming.yaml
@@ -7,4 +7,3 @@ additionalProperties:
  artifactId: petstore-okhttp-gson
  hideGenerationTimestamp: "true"
  supportStreaming: true
-  serializableModel: true
--- a/bin/configs/java-resteasy.yaml
+++ b/bin/configs/java-resteasy.yaml
@@ -1,8 +1,8 @@
 generatorName: java
 outputDir: samples/client/petstore/java/resteasy
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+library: resteasy
+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:
  artifactId: petstore-resteasy
  hideGenerationTimestamp: "true"
-  library: resteasy
--- a/bin/configs/java-resttemplate-withXml.yaml
+++ b/bin/configs/java-resttemplate-withXml.yaml
@@ -1,7 +1,7 @@
 generatorName: java
 outputDir: samples/client/petstore/java/resttemplate-withXml
 library: resttemplate
-inputSpec: modules/openapi-generator/src/test/resources/3_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.yaml
 templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
  java8: true
--- a/bin/configs/java-resttemplate.yaml
+++ b/bin/configs/java-resttemplate.yaml
@@ -1,7 +1,7 @@
 generatorName: java
 outputDir: samples/client/petstore/java/resttemplate
 library: resttemplate
-inputSpec: modules/openapi-generator/src/test/resources/3_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.yaml
 templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
  artifactId: petstore-resttemplate
--- a/bin/configs/java-undertow-server-java-undertow.yaml
+++ b/bin/configs/java-undertow-server-java-undertow.yaml
@@ -1,6 +1,6 @@
 generatorName: java-undertow-server
 outputDir: samples/server/petstore/java-undertow
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/java-undertow-server
 additionalProperties:
  hideGenerationTimestamp: "true"
--- a/bin/configs/java-vertx.yaml
+++ b/bin/configs/java-vertx.yaml
@@ -1,7 +1,7 @@
 generatorName: java
 outputDir: samples/client/petstore/java/vertx
 library: vertx
-inputSpec: modules/openapi-generator/src/test/resources/3_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.yaml
 templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
  artifactId: petstore-vertx
--- a/bin/configs/javascript-es6.yaml
+++ b/bin/configs/javascript-es6.yaml
@@ -5,10 +5,3 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/javascript/petstore-
 templateDir: modules/openapi-generator/src/main/resources/Javascript
 additionalProperties:
  appName: PetstoreClient
-modelNameMappings:
-  HealthCheckResult: HealthCheckStatus
-parameterNameMappings:
-  query_1: queryOne
-# the following has no effect as js client gen use baseName directly
-nameMappings:
-  NullableMessage: nullable_field
--- a/bin/configs/julia-client-petstore-new.yaml
+++ b/bin/configs/julia-client-petstore-new.yaml
@@ -1,13 +1,9 @@
 generatorName: julia-client
 outputDir: samples/client/petstore/julia
-inputSpec: modules/openapi-generator/src/test/resources/3_0/julia/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/julia-client
 additionalProperties:
  hideGenerationTimestamp: "true"
  packageName: OpenAPIGenPetStoreClient
  exportOperations: "true"
-  exportModels: "true"
-modelNameMappings:
-  another_model: MappedModel
-nameMappings:
-  another_property: mappedProperty 
+  exportModels: "true"
--- a/bin/configs/julia-server-petstore-new.yaml
+++ b/bin/configs/julia-server-petstore-new.yaml
@@ -1,9 +1,9 @@
 generatorName: julia-server
 outputDir: samples/server/petstore/julia
-inputSpec: modules/openapi-generator/src/test/resources/3_0/julia/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/julia-server
 additionalProperties:
  hideGenerationTimestamp: "true"
  packageName: OpenAPIGenPetStoreServer
  exportOperations: "true"
-  exportModels: "true"
+  exportModels: "true"
--- a/bin/configs/kotlin-jvm-jackson.yaml
+++ b/bin/configs/kotlin-jvm-jackson.yaml
@@ -1,9 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/petstore/kotlin-jvm-jackson
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-additionalProperties:
-  artifactId: kotlin-petstore-jvm-jackson
-  enumUnknownDefaultCase: true
-  serializationLibrary: jackson
-  library: jvm-retrofit2
--- a/bin/configs/kotlin-jvm-okhttp-parameter-tests.yaml
+++ b/bin/configs/kotlin-jvm-okhttp-parameter-tests.yaml
@@ -1,7 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/others/kotlin-jvm-okhttp-parameter-tests
-library: jvm-okhttp4
-inputSpec: modules/openapi-generator/src/test/resources/3_0/parameter-test-spec.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-additionalProperties:
-  artifactId: kotlin-petstore-okhttp4-parameter-tests
--- a/bin/configs/kotlin-server-jaxrs-spec-mutiny.yaml
+++ b/bin/configs/kotlin-server-jaxrs-spec-mutiny.yaml
@@ -1,9 +0,0 @@
-generatorName: kotlin-server
-outputDir: samples/server/petstore/kotlin-server/jaxrs-spec-mutiny
-library: jaxrs-spec
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-server
-additionalProperties:
-  returnResponse: "true"
-  interfaceOnly: "true"
-  useMutiny: "true"
--- a/bin/configs/kotlin-server-jaxrs-spec-parameter-tests.yaml
+++ b/bin/configs/kotlin-server-jaxrs-spec-parameter-tests.yaml
@@ -1,7 +0,0 @@
-generatorName: kotlin-server
-outputDir: samples/server/others/kotlin-server/jaxrs-spec
-library: jaxrs-spec
-inputSpec: modules/openapi-generator/src/test/resources/3_0/parameter-test-spec.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-server
-additionalProperties:
-  useCoroutines: "true"
--- a/bin/configs/kotlin-spring-default.yaml
+++ b/bin/configs/kotlin-spring-default.yaml
@@ -1,14 +0,0 @@
-generatorName: kotlin-spring
-outputDir: samples/server/petstore/kotlin-spring-default
-library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
-# comment out below to use default settings
-#additionalProperties:
-#  documentationProvider: none
-#  annotationLibrary: none
-#  useSwaggerUI: "false"
-#  serviceImplementation: "true"
-#  serializableModel: "true"
-#  beanValidations: "true"
-#  useSpringBoot3: "true"
--- a/bin/configs/lua.yaml
+++ b/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
--- a/bin/configs/perl.yaml
+++ b/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
--- a/bin/configs/php-OpenAPIClient.yaml
+++ b/bin/configs/php-OpenAPIClient.yaml
@@ -1,11 +1,4 @@
 generatorName: php
 outputDir: samples/client/petstore/php/OpenAPIClient-php
-inputSpec: modules/openapi-generator/src/test/resources/3_0/php/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/php
-nameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
-  type-: type_with_dash
-parameterNameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
--- a/bin/configs/php-nextgen-echo-api.yaml
+++ b/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"
--- a/bin/configs/php-nextgen.yaml
+++ b/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
--- a/bin/configs/php-psr-18.yaml
+++ b/bin/configs/php-psr-18.yaml
@@ -1,12 +0,0 @@
-generatorName: php
-outputDir: samples/client/petstore/php/psr-18
-inputSpec: modules/openapi-generator/src/test/resources/3_0/php/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/php
-library: psr-18
-nameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
-  type-: type_with_dash
-parameterNameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
--- a/bin/configs/powershell.yaml
+++ b/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
--- a/bin/configs/python-flask.yaml
+++ b/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
--- a/bin/configs/r-httr2-client.yaml
+++ b/bin/configs/r-httr2-client.yaml
@@ -4,12 +4,6 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/r/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/r
 httpUserAgent: PetstoreAgent
 library: httr2
-modelNameMappings:
-  dummy_model: JustModel
-parameterNameMappings:
-  path_array: path_array_parameter
-nameMappings:
-  percent_description: percent
 additionalProperties:
  packageName: petstore
  exceptionPackage: rlang
@@ -17,4 +11,3 @@ additionalProperties:
  returnExceptionOnFailure: true
  errorObjectType: "ModelApiResponse"
  operationIdNaming: snake_case
-
--- a/bin/configs/rust-reqwest-name-mapping.yaml
+++ b/bin/configs/rust-reqwest-name-mapping.yaml
@@ -1,16 +0,0 @@
-generatorName: rust
-outputDir: samples/client/petstore/rust/reqwest/name-mapping
-library: reqwest
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/rust-name-mapping-test.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust
-additionalProperties:
-  supportAsync: false
-  packageName: petstore-name-mapping
-nameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
-  -type: dash_type
-parameterNameMappings:
-  _type: underscore_type
-  type_: type_with_underscore
-  -type: dash_type
--- a/bin/configs/scala-pekko-http-server.yaml
+++ b/bin/configs/scala-pekko-http-server.yaml
@@ -1,7 +0,0 @@
-generatorName: scala-akka-http-server
-outputDir: samples/server/petstore/scala-pekko-http-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-akka-http-server
-additionalProperties:
-  artifactId: openapi-scala-pekko-http-server
-  useApachePekko: true
--- a/bin/configs/spring-boot-reactive-noResponseEntity.yaml
+++ b/bin/configs/spring-boot-reactive-noResponseEntity.yaml
@@ -1,12 +0,0 @@
-generatorName: spring
-outputDir: samples/server/petstore/springboot-reactive-noResponseEntity
-inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  groupId: org.openapitools.openapi3
-  artifactId: springboot-reactive-noResponseEntity
-  documentationProvider: springfox
-  reactive: "true"
-  hideGenerationTimestamp: "true"
-  delegatePattern: "true"
-  useResponseEntity: "false"
--- a/bin/configs/spring-cloud-deprecated-oas3.yaml
+++ b/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"
--- a/bin/configs/swift5-nonPublicApi.yaml
+++ b/bin/configs/swift5-nonPublicApi.yaml
@@ -10,12 +10,3 @@ additionalProperties:
  nonPublicApi: true
  projectName: PetstoreClient
  podHomepage: https://github.com/openapitools/openapi-generator
-nameMappings:
-  _type: underscoreType
-  type_: typeWithUnderscore
-  -type: dashType
-parameterNameMappings:
-  _type: underscoreType
-  type_: typeWithUnderscore
-  -type: dashType
-
--- a/bin/configs/unmaintained/openapi3/python-flask-python2.yaml
+++ b/bin/configs/unmaintained/openapi3/python-flask-python2.yaml
@@ -0,0 +1,6 @@
+generatorName: python-flask
+outputDir: samples/openapi3/server/petstore/python-flask-python2
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-object-as-parameter.yaml
+templateDir: modules/openapi-generator/src/main/resources/python-flask
+additionalProperties:
+  supportPython2: true
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -413,18 +413,10 @@ One can map the property name using `nameMappings` option and parameter name usi

 Here is an example to use `nameMappings` and `parameterNameMapping` in CLI:
 ```sh
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml  -o /tmp/java2/ --name-mappings _type=underscoreType,type_=typeWithUnderscore, --parameter-name-mappings _type=paramType,type_=typeParam
+java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml  -o /tmp/java2/ --name-mappings _type=underscoreType, type_=typeWithUnderscore, --parameter-name-mappings _type=paramType, type_=typeParam
 ```

-To map model names, use `modelNameMappings` option, e.g.
-```sh
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g csharp -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml  -o /tmp/csharp/ --model-name-mappings Tag=Label
-```
-will rename the `Tag` schema to `Label` instead.
-
-Not all generators support thess features yet. Please give it a try to confirm the behaviour and open an issue (ticket) to let us know which generators you would like to have this feature enabled and we'll prioritize accordingly. We also welcome PRs to add these features to generators. Related PRs for reference: #16209, #16234 (modelNameMappings), #16194, #16206 (nameMappings, parameterNameMappings).
-
-NOTE: some generators use `baseName` (original name obtained direclty from OpenAPI spec, e.g. `shipping-date`) mustache tag in the templates so the mapping feature won't work.
+(Not all generators support this feature yet. Please give it a try to confirm the behaviour and open an issue (ticket) to let us know which generators you would like to have this feature enabled and we'll prioritize accordingly.)

 ## Schema Mapping

--- a/docs/generators.md
+++ b/docs/generators.md
@@ -50,7 +50,6 @@ 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)  
 * [r](generators/r.md)  
--- a/docs/generators/aspnetcore.md
+++ b/docs/generators/aspnetcore.md
@@ -197,7 +197,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>string</li>
 <li>struct</li>
 <li>switch</li>
-<li>system</li>
 <li>this</li>
 <li>throw</li>
 <li>true</li>
--- a/docs/generators/csharp-functions.md
+++ b/docs/generators/csharp-functions.md
@@ -190,7 +190,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>string</li>
 <li>struct</li>
 <li>switch</li>
-<li>system</li>
 <li>this</li>
 <li>throw</li>
 <li>true</li>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
William Cheng	8ecf9e352d	fix additional properties any type	2023-07-30 16:25:18 +08:00
William Cheng	07d4f7d534	update template and samples	2023-07-30 16:20:45 +08:00
William Cheng	659885f509	better additional properties support	2023-07-30 16:15:07 +08:00
@@ -1 +1 @@
 
 .8