fix additional properties any type

update template and samples
better additional properties support
2025-12-03 17:00:43 +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 · 2023-07-30 01:19:11 +08:00 · 2023-07-30 00:42:46 +08:00
11607 changed files with 467322 additions and 528516 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,9 +38,18 @@ commands: # a reusable command with parameters
      - run:
          command: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; '
      - run:
-          command: |-
-            printf '127.0.0.1       petstore.swagger.io
-            ' | sudo tee -a /etc/hosts
+          command: |
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       path.v1.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       path.v2.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.111     path.v3.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       operation.v1.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       operation.v2.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.111     operation.v3.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       server.v1.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       server.v2.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.111     server.v3.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       petstore.swagger.io"
+            cat /etc/hosts
      #    - run: docker pull openapitools/openapi-petstore
      #    - run: docker run -d -e OPENAPI_BASE_PATH=/v3 -e DISABLE_API_KEY=1 -e DISABLE_OAUTH=1 -p 80:8080 openapitools/openapi-petstore
      - run: docker pull swaggerapi/petstore
@@ -49,7 +58,7 @@ commands: # a reusable command with parameters
      - run: sleep 30
      - run: cat /etc/hosts
      # Test
-      - run: mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+      - run: ./mvnw --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
      - run:
          name: "Setup custom environment variables"
          command: echo 'export CIRCLE_NODE_INDEX="<<parameters.nodeNo>>"' >> $BASH_ENV
--- a/.github/actions/run-samples/action.yaml
+++ b/.github/actions/run-samples/action.yaml
@@ -15,5 +15,5 @@ inputs:
 runs:
  using: "composite"
  steps:
-    - run: mvn clean --no-snapshot-updates --batch-mode --quiet ${{ inputs.goal }} -P${{ inputs.name }} -Dintegration-test -Dmaven.javadoc.skip=true ${{ inputs.args }}
+    - run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet ${{ inputs.goal }} -P${{ inputs.name }} -Dintegration-test -Dmaven.javadoc.skip=true ${{ inputs.args }}
      shell: bash
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,3 +4,9 @@ updates:
    directory: "/"
    schedule:
      interval: "daily"
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    allow:
+      - dependency-name: "com.gradle.*"
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -7,13 +7,14 @@ on:
      - run-in-docker.sh
      - pom.xml
      - modules/openapi-generator-online/pom.xml
+      - modules/openapi-generator-online/Dockerfile
  pull_request:
    paths:
      - Dockerfile
      - run-in-docker.sh
      - pom.xml
      - modules/openapi-generator-online/pom.xml
-
+      - modules/openapi-generator-online/Dockerfile
 jobs:
  build:
    name: 'Build: Docker'
@@ -34,4 +35,5 @@ jobs:

      - name: Build modules/openapi-generator-online
        shell: bash
-        run: docker build modules/openapi-generator-online/
+        run: |
+          docker build modules/openapi-generator-online/ -t test
--- a/.github/workflows/gradle-plugin-tests.yaml
+++ b/.github/workflows/gradle-plugin-tests.yaml
@@ -38,7 +38,7 @@ jobs:
        env:
          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
        run: |
-          mvn clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+          ./mvnw clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk) # using gradle-6.8.3 via wrapper
          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)
          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildDotnetSdk)
--- a/.github/workflows/gradle-test.yaml
+++ b/.github/workflows/gradle-test.yaml
@@ -28,6 +28,7 @@ jobs:
          - samples/client/petstore/java/jersey2-java8
          - samples/client/petstore/java/okhttp-gson
          - samples/client/petstore/java/okhttp-gson-group-parameter
+          - samples/client/petstore/java/webclient-swagger2
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-java@v3
--- a/.github/workflows/linux.yaml
+++ b/.github/workflows/linux.yaml
@@ -45,14 +45,14 @@ jobs:
            ${{ runner.os }}-gradle-

      - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.7.0
+        uses: s4u/setup-maven-action@v1.8.0
        with:
          java-version: ${{ matrix.java }}
-          maven-version: 3.9.0
+          maven-version: 3.8.8

      - name: Build with Maven
        shell: bash
-        run: mvn clean -nsu -B --quiet -Djacoco.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress install --file pom.xml
+        run: ./mvnw clean -nsu -B --quiet -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress install --file pom.xml
        env:
          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

@@ -87,10 +87,10 @@ jobs:
      - name: Check out code
        uses: actions/checkout@v3
      - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.7.0
+        uses: s4u/setup-maven-action@v1.8.0
        with:
          java-version: 11
-          maven-version: 3.9.0
+          maven-version: 3.8.8
      - name: Download build artifact
        uses: actions/download-artifact@v3
        with:
@@ -101,7 +101,7 @@ jobs:
          git config --global core.fileMode false
          git config --global core.safecrlf false
          git config --global core.autocrlf true
-          mvn clean package -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
+          ./mvnw clean package -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
          # test with java (jersey2) client generation only as ensure-up-to-date script is run in another job instead
          ./bin/generate-samples.sh ./bin/configs/java-jersey2-8.yaml
          # test debugSupportingFiles
--- a/.github/workflows/maven-plugin-tests.yaml
+++ b/.github/workflows/maven-plugin-tests.yaml
@@ -37,8 +37,8 @@ jobs:
        env:
          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
        run: |
-          mvn clean install -DskipTests -Dmaven.javadoc.skip=true
-          mvn --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-          mvn --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-          mvn --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-          mvn --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+          ./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
+          ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+          ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+          ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+          ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
--- a/.github/workflows/openapi-generator.yaml
+++ b/.github/workflows/openapi-generator.yaml
@@ -36,7 +36,7 @@ jobs:
            ${{ runner.os }}-build-${{ env.cache-name }}-
            ${{ runner.os }}-build-
      - name: Run maven
-        run: mvn clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+        run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
        env:
          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
      - run: ls -la  modules/openapi-generator-cli/target
@@ -74,7 +74,7 @@ jobs:
            ${{ runner.os }}-build-${{ env.cache-name }}-
            ${{ runner.os }}-build-
      - name: Run unit tests
-        run: mvn clean --no-snapshot-updates --batch-mode --quiet --fail-at-end test -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+        run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet --fail-at-end test -Dorg.slf4j.simpleLogger.defaultLogLevel=error
        env:
          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
      - name: Publish unit test reports
--- a/.github/workflows/samples-c-libcurl-client.yaml
+++ b/.github/workflows/samples-c-libcurl-client.yaml
@@ -0,0 +1,27 @@
+name: Samples c libcurl client
+
+on:
+  push:
+    paths:
+      - 'samples/client/petstore/c/**'
+  pull_request:
+    paths:
+      - 'samples/client/petstore/c/**'
+
+jobs:
+  build:
+    name: Build c libcurl client
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Prepare
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libssl-dev libcurl4-openssl-dev
+      - name: Build
+        working-directory: "samples/client/petstore/c"
+        run: |
+          mkdir build
+          cd build
+          cmake ..
+          make
--- a/.github/workflows/samples-dart.yaml
+++ b/.github/workflows/samples-dart.yaml
@@ -22,22 +22,14 @@ jobs:
        with:
          distribution: 'temurin'
          java-version: 11
-      - name: Cache maven dependencies
-        uses: actions/cache@v3
-        env:
-          cache-name: maven-repository
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gradle
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+          cache: maven
      - name: Cache test dependencies
        uses: actions/cache@v3
        env:
          cache-name: pub-cache
        with:
          path: $PUB_CACHE
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('samples/**/pubspec.yaml') }}
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('samples/**/pubspec.*') }}
      - uses: dart-lang/setup-dart@v1
        with:
          sdk: 2.15.0
--- a/.github/workflows/samples-dotnet-standard.yaml
+++ b/.github/workflows/samples-dotnet-standard.yaml
@@ -3,10 +3,10 @@ name: Samples C# .Net Standard
 on:
  push:
    paths:
-      - 'samples/client/petstore/csharp-netcore/**netstandard**/'
+      - 'samples/client/petstore/csharp/**netstandard**/'
  pull_request:
    paths:
-      - 'samples/client/petstore/csharp-netcore/**netstandard**/'
+      - 'samples/client/petstore/csharp/**netstandard**/'
 jobs:
  build:
    name: Build .Net projects
@@ -16,10 +16,10 @@ jobs:
      matrix:
        sample:
          # clients
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0
    steps:
      - uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v3.1.0
+      - uses: actions/setup-dotnet@v3.2.0
        with:
          dotnet-version: 3.1.*
      - name: Build
--- a/.github/workflows/samples-dotnet.yaml
+++ b/.github/workflows/samples-dotnet.yaml
@@ -3,16 +3,17 @@ name: Samples C# .Net 7
 on:
  push:
    paths:
-      - 'samples/client/petstore/csharp-netcore/**net6.0**/'
-      - 'samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore**/'
+      - 'samples/client/petstore/csharp/**net6.0**/'
+      - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
+      - 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**'
      - 'samples/server/petstore/aspnetcore-6.0/**'
      - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
      - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**'
-      - 'samples/server/petstore/aspnetcore-6.0-useNewtonsoft/**'
  pull_request:
    paths:
-      - 'samples/client/petstore/csharp-netcore/**net6.0**/'
-      - 'samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore**/'
+      - 'samples/client/petstore/csharp/**net6.0**/'
+      - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
+      - 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**'
      - 'samples/server/petstore/aspnetcore-6.0/**'
      - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
      - 'samples/server/petstore/aspnetcore-6.0-project4Models/**'
@@ -28,11 +29,12 @@ jobs:
      matrix:
        sample:
          # clients
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests
          - samples/server/petstore/aspnetcore-6.0
          - samples/server/petstore/aspnetcore-6.0-pocoModels
          - samples/server/petstore/aspnetcore-6.0-project4Models
@@ -41,7 +43,7 @@ jobs:
          - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes
    steps:
      - uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v3.1.0
+      - uses: actions/setup-dotnet@v3.2.0
        with:
          dotnet-version: '7.0.x'
      - name: Build
--- a/.github/workflows/samples-dotnet6-client-echo-api.yaml
+++ b/.github/workflows/samples-dotnet6-client-echo-api.yaml
@@ -0,0 +1,31 @@
+name: Samples C# .Net 6
+
+on:
+  push:
+    paths:
+      - samples/client/echo_api/csharp-restsharp/**
+  pull_request:
+    paths:
+      - samples/client/echo_api/csharp-restsharp/**
+jobs:
+  build:
+    name: Build .Net clients
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/echo_api/csharp-restsharp/
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-dotnet@v3.2.0
+        with:
+          dotnet-version: '6.0.x'
+      - name: Run echo server
+        run: |
+          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
+          (cd http-echo-server && npm install && npm start &)
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: dotnet build Org.OpenAPITools.sln
--- a/.github/workflows/samples-dotnet6-client.yaml
+++ b/.github/workflows/samples-dotnet6-client.yaml
@@ -4,41 +4,45 @@ on:
  push:
    paths:
      # build C# API client (multiple frameworks)
-      - samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/**
+      - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
      # build C# API client (httpclient)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/**
+      - samples/client/petstore/csharp/OpenAPIClient-httpclient/**
      # build C# API client (generichost)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/**
+      - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/**
      # build C# API client (netcore)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient/**
-      - samples/client/petstore/csharp-netcore/OpenAPIClientCore/**
+      - samples/client/petstore/csharp/OpenAPIClient/**
+      - samples/client/petstore/csharp/OpenAPIClientCore/**
      # build C# API client (.net framework 4.7)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-net47/**
+      - samples/client/petstore/csharp/OpenAPIClient-net47/**
      # build C# API client (.net framework 4.8)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-net48/**
+      - samples/client/petstore/csharp/OpenAPIClient-net48/**
      # build C# API client (.net 5.0)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/**
+      - samples/client/petstore/csharp/OpenAPIClient-net5.0/**
      # build C# API client (.net 5.0 with ConditionalSerialization)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/**
+      - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
+      # build C# API client (property, parameter name mappings)
+      - samples/client/petstore/csharp-restsharp-name-parameter-mappings/**
  pull_request:
    paths:
      # build C# API client (multiple frameworks)
-      - samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/**
+      - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
      # build C# API client (httpclient)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/**
+      - samples/client/petstore/csharp/OpenAPIClient-httpclient/**
      # build C# API client (generichost)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/**
+      - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/**
      # build C# API client (netcore)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient/**
-      - samples/client/petstore/csharp-netcore/OpenAPIClientCore/**
+      - samples/client/petstore/csharp/OpenAPIClient/**
+      - samples/client/petstore/csharp/OpenAPIClientCore/**
      # build C# API client (.net framework 4.7)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-net47/**
+      - samples/client/petstore/csharp/OpenAPIClient-net47/**
      # build C# API client (.net framework 4.8)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-net48/**
+      - samples/client/petstore/csharp/OpenAPIClient-net48/**
      # build C# API client (.net 5.0)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/**
+      - samples/client/petstore/csharp/OpenAPIClient-net5.0/**
      # build C# API client (.net 5.0 with ConditionalSerialization)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/**
+      - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
+      # build C# API client (property, parameter name mappings)
+      - samples/client/petstore/csharp-restsharp-name-parameter-mappings/**
 jobs:
  build:
    name: Build .Net clients
@@ -49,25 +53,27 @@ jobs:
        sample:
          # clients
          # build C# API client (multiple frameworks)
-          - samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/
+          - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/
          # build C# API client (httpclient)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/
+          - samples/client/petstore/csharp/OpenAPIClient-httpclient/
          # build C# API client (generichost)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/
          # build C# API client (netcore)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient/
-          - samples/client/petstore/csharp-netcore/OpenAPIClientCore/
+          - samples/client/petstore/csharp/OpenAPIClient/
+          - samples/client/petstore/csharp/OpenAPIClientCore/
          # build C# API client (.net framework 4.7)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-net47/
+          - samples/client/petstore/csharp/OpenAPIClient-net47/
          # build C# API client (.net framework 4.8)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-net48/
+          - samples/client/petstore/csharp/OpenAPIClient-net48/
          # build C# API client (.net 5.0)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/
+          - samples/client/petstore/csharp/OpenAPIClient-net5.0/
          # build C# API client (.net 5.0 with ConditionalSerialization)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/
+          - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/
+          # build C# API client (property, parameter name mappings)
+          - samples/client/petstore/csharp-restsharp-name-parameter-mappings
    steps:
      - uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v3.1.0
+      - uses: actions/setup-dotnet@v3.2.0
        with:
          dotnet-version: '6.0.x'
      - name: Build
--- a/.github/workflows/samples-dotnet6-server.yaml
+++ b/.github/workflows/samples-dotnet6-server.yaml
@@ -6,7 +6,6 @@ on:
      - 'samples/server/petstore/aspnetcore-6.0/**'
      - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
      - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**'
-      - 'samples/server/petstore/aspnetcore-6.0-useNewtonsoft/**'
  pull_request:
    paths:
      - 'samples/server/petstore/aspnetcore-6.0/**'
@@ -31,7 +30,7 @@ jobs:
          - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes
    steps:
      - uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v3.1.0
+      - uses: actions/setup-dotnet@v3.2.0
        with:
          dotnet-version: '6.0.x'
      - name: Build
--- a/.github/workflows/samples-java-client-jdk11.yaml
+++ b/.github/workflows/samples-java-client-jdk11.yaml
@@ -8,6 +8,7 @@ on:
      - samples/client/petstore/java-micronaut-client/**
      - samples/openapi3/client/petstore/java/jersey2-java8-special-characters/**
      - samples/openapi3/client/petstore/java/jersey2-java8-swagger1/**
+      - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/**
      - samples/openapi3/client/petstore/java/native**
  pull_request:
    paths:
@@ -16,6 +17,7 @@ on:
      - samples/client/petstore/java-micronaut-client/**
      - samples/openapi3/client/petstore/java/jersey2-java8-special-characters/**
      - samples/openapi3/client/petstore/java/jersey2-java8-swagger1/**
+      - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/**
      - samples/openapi3/client/petstore/java/native**
 jobs:
  build:
@@ -38,6 +40,7 @@ jobs:
          - samples/client/petstore/java/resttemplate-withXml
          - samples/client/petstore/java/webclient
          - samples/client/petstore/java/webclient-nullable-arrays
+          - samples/client/petstore/java/webclient-swagger2
          - samples/client/petstore/java/vertx
          - samples/client/petstore/java/jersey2-java8-localdatetime
          - samples/client/petstore/java/resteasy
@@ -54,6 +57,9 @@ jobs:
          - samples/client/petstore/java/okhttp-gson-swagger1/
          - samples/client/petstore/java/resttemplate-swagger1/
          - samples/openapi3/client/petstore/java/jersey2-java8-swagger1/
+          - samples/client/petstore/java/okhttp-gson-swagger2/
+          - samples/client/petstore/java/resttemplate-swagger2/
+          - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-java@v3
--- a/.github/workflows/samples-julia.yaml
+++ b/.github/workflows/samples-julia.yaml
@@ -0,0 +1,41 @@
+name: Samples Julia
+
+on:
+  push:
+    paths:
+      - 'samples/client/petstore/julia/**'
+      - 'samples/server/petstore/julia/**'
+  pull_request:
+    paths:
+      - 'samples/client/petstore/julia/**'
+      - 'samples/server/petstore/julia/**'
+
+jobs:
+  tests-julia:
+    name: Tests Julia
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: julia-actions/setup-julia@v1
+        with:
+          version: 1.8
+          arch: x64
+      - name: Test
+        shell: bash
+        working-directory: 'samples'
+        run: |
+          currdir=`pwd`
+          # Using a specific version of OpenAPI.jl helps avoid introducing version inter-dependencies
+          #   and allows breaking changes to be done in either repos independently
+          # Using develop mode to install package so that it is easier to modify the package test files
+          julia -e "using Pkg; Pkg.develop(\"OpenAPI\");"
+          cd ~/.julia/dev/OpenAPI
+          git checkout v0.1.14
+          cd $currdir
+          rm -rf ~/.julia/dev/OpenAPI/test/client/openapigenerator_petstore_v3/petstore
+          rm -rf ~/.julia/dev/OpenAPI/test/server/openapigenerator_petstore_v3/petstore
+          cp -r client/petstore/julia ~/.julia/dev/OpenAPI/test/client/openapigenerator_petstore_v3/petstore
+          cp -r server/petstore/julia ~/.julia/dev/OpenAPI/test/server/openapigenerator_petstore_v3/petstore
+          # setting this env runs only the tests relevant to the openapi-generator repo
+          export OPENAPI_GENERATOR=true
+          julia -e "using Pkg; Pkg.test(\"OpenAPI\");"
--- a/.github/workflows/samples-kotlin-client.yaml
+++ b/.github/workflows/samples-kotlin-client.yaml
@@ -51,7 +51,7 @@ jobs:
          - samples/client/petstore/kotlin-bigdecimal-default-okhttp4
          - samples/client/petstore/kotlin-jvm-ktor-jackson
          - samples/client/petstore/kotlin-jvm-ktor-gson
-          - samples/client/petstore/kotlin-jvm-ktor-gson
+          - samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization
          - samples/client/petstore/kotlin-jvm-vertx-gson
          - samples/client/petstore/kotlin-jvm-vertx-jackson
          - samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines
@@ -59,6 +59,7 @@ jobs:
          - samples/client/petstore/kotlin-jvm-spring-2-webclient
          - samples/client/petstore/kotlin-jvm-spring-3-webclient
          - samples/client/petstore/kotlin-spring-cloud
+          - samples/client/petstore/kotlin-name-parameter-mappings
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-java@v3
--- a/.github/workflows/samples-rust.yaml
+++ b/.github/workflows/samples-rust.yaml
@@ -3,12 +3,14 @@ name: Samples Rust
 on:
  push:
    paths:
-      - 'samples/client/petstore/rust/**'
-      - 'samples/server/petstore/rust-server/**'
+      - "samples/client/others/rust/**"
+      - "samples/server/petstore/rust-server/**"
+      - "samples/client/petstore/rust-server/**"
  pull_request:
    paths:
-      - 'samples/client/petstore/rust/**'
-      - 'samples/server/petstore/rust-server/**'
+      - "samples/client/others/rust/**"
+      - "samples/client/petstore/rust/**"
+      - "samples/server/petstore/rust-server/**"

 jobs:
  build:
@@ -19,6 +21,7 @@ jobs:
      matrix:
        sample:
          # these folders contain sub-projects of rust clients, servers
+          - samples/client/others/rust/
          - samples/client/petstore/rust/
          - samples/server/petstore/rust-server/
    steps:
--- a/.github/workflows/samples-spring-jdk17.yaml
+++ b/.github/workflows/samples-spring-jdk17.yaml
@@ -0,0 +1,36 @@
+name: Samples Java Spring (JDK17)
+
+on:
+  push:
+    paths:
+      - samples/openapi3/client/petstore/spring-cloud-3-with-optional
+  pull_request:
+    paths:
+      - samples/openapi3/client/petstore/spring-cloud-3-with-optional
+jobs:
+  build:
+    name: Build Java Spring (JDK17)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/openapi3/client/petstore/spring-cloud-3-with-optional
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - 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
--- a/.github/workflows/samples-spring.yaml
+++ b/.github/workflows/samples-spring.yaml
@@ -26,6 +26,7 @@ jobs:
          - samples/openapi3/client/petstore/spring-stubs-skip-default-interface
          - samples/openapi3/client/petstore/spring-cloud-async
          - samples/openapi3/client/petstore/spring-cloud-spring-pageable
+          - samples/client/petstore/spring-cloud-tags
          # servers
          - samples/server/petstore/springboot
          - samples/openapi3/server/petstore/springboot
--- a/.github/workflows/samples-zapier.yaml
+++ b/.github/workflows/samples-zapier.yaml
@@ -0,0 +1,30 @@
+name: Samples Zapier
+
+on:
+  push:
+    branches:
+      - 'samples/client/petstore/zapier/**'
+  pull_request:
+    paths:
+      - 'samples/client/petstore/zapier/**'
+
+jobs:
+  validate:
+    name: Test zapier generation
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/client/petstore/zapier
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup node
+      uses: actions/setup-node@v3
+    - name: Install dependencies
+      working-directory: ${{ matrix.sample }}
+      run: |
+        npm install
+    - name: Validate
+      working-directory: ${{ matrix.sample }}
+      run: node index.js
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -19,8 +19,8 @@ jobs:
        distribution: 'temurin'
        java-version: 11
    - name: Compile with Maven
-      run: mvn -B -q clean install jacoco:report
+      run: ./mvnw -B -q clean install jacoco:report
    - name: Jacoco Aggregate
-      run: mvn jacoco:report-aggregate
+      run: ./mvnw jacoco:report-aggregate
    - name: Publish to Sonar
-      run: mvn -B -q -nsu sonar:sonar -Dsonar.projectKey=OpenAPITools_openapi-generator -Dsonar.organization=openapitools -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_LOGIN }} -Dsonar.branch.name=${GITHUB_REF##*/}
+      run: ./mvnw -B -q -nsu sonar:sonar -Dsonar.projectKey=OpenAPITools_openapi-generator -Dsonar.organization=openapitools -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_LOGIN }} -Dsonar.branch.name=${GITHUB_REF##*/}
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -39,14 +39,19 @@ jobs:
            ${{ runner.os }}-build-${{ env.cache-name }}-
            ${{ runner.os }}-build-
      - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.7.0
+        uses: s4u/setup-maven-action@v1.8.0
        with:
          java-version: ${{ matrix.java }}
-          maven-version: 3.9.0
+          maven-version: 3.8.8
      - name: Run maven
-        run: mvn clean --no-snapshot-updates --batch-mode --quiet install
+        run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet install
        env:
          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+      - name: Test Template Retrieval
+        run: |
+          cd modules/openapi-generator-cli/target
+          # generator names containing "-" caused problems in the past, see https://github.com/OpenAPITools/openapi-generator/issues/9528
+          java -jar ./openapi-generator-cli.jar author template --verbose  -g jaxrs-spec --library quarkus
      - name: Setup Gradle
        uses: gradle/gradle-build-action@v2
      - name: Gradle tests
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}
--- a/.mvn/wrapper/maven-wrapper.jar
+++ b/.mvn/wrapper/maven-wrapper.jar
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -5,14 +5,14 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
--- a/.travis.yml
+++ b/.travis.yml
@@ -127,21 +127,6 @@ before_install:
      gpg --check-trustdb ;
    fi;
  - pushd .; cd website; yarn install; popd
-  # install Deno
-  #- sh -s v1.6.2 < ./CI/deno_install.sh
-  #- export PATH="$HOME/.deno/bin:$PATH"
-
-install:
-  # Add Godeps dependencies to GOPATH and PATH
-  #- eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.4 bash)"
-  #- export GOPATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace"
-  - export PATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin:$HOME/.cargo/bin:$PATH:/usr/lib/dart/bin"
-  #- go version
-  - gcc -v
-  - echo $CC
-  - echo $CXX
-  #- pub version
-  #- dart --version

 script:
  # fail fast
@@ -151,14 +136,13 @@ 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
-  - mvn -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
-  #- mvn -e --no-snapshot-updates --quiet --batch-mode --show-version verify -Psamples -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
      if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ]; then
        echo "Publishing from branch $TRAVIS_BRANCH";
-        mvn clean deploy --quiet -DskipTests=true -B -U -P release --settings CI/settings.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error;
+        ./mvnw clean deploy --quiet -DskipTests=true -B -U -P release --settings CI/settings.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error;
        echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
        pushd .;
        cd modules/openapi-generator-gradle-plugin;
@@ -167,7 +151,7 @@ after_success:
        popd;
      elif [ -z $TRAVIS_TAG ] && [[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]; then
        echo "Publishing from branch $TRAVIS_BRANCH";
-        mvn clean deploy --quiet --settings CI/settings.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error;
+        ./mvnw clean deploy --quiet --settings CI/settings.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error;
        echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
        pushd .;
        cd modules/openapi-generator-gradle-plugin;
--- a/CI/circle_parallel.sh
+++ b/CI/circle_parallel.sh
@@ -22,7 +22,7 @@ if [ "$NODE_INDEX" = "1" ]; then
  echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..."
  java -version

-  mvn --no-snapshot-updates --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  ./mvnw --no-snapshot-updates --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error

 elif [ "$NODE_INDEX" = "2" ]; then
  echo "Running node $NODE_INDEX to test Go"
@@ -43,7 +43,7 @@ elif [ "$NODE_INDEX" = "2" ]; then
  go version

  # run integration tests
-  mvn --no-snapshot-updates --quiet verify -Psamples.misc -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  ./mvnw --no-snapshot-updates --quiet verify -Psamples.misc -Dorg.slf4j.simpleLogger.defaultLogLevel=error
 elif [ "$NODE_INDEX" = "3" ]; then

  echo "Running node $NODE_INDEX to test 'samples.circleci.node3' defined in pom.xml ..."
@@ -72,7 +72,7 @@ elif [ "$NODE_INDEX" = "3" ]; then
  echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
  echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV

-  mvn --no-snapshot-updates --quiet verify -Psamples.circleci.node3 -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  ./mvnw --no-snapshot-updates --quiet verify -Psamples.circleci.node3 -Dorg.slf4j.simpleLogger.defaultLogLevel=error

 elif [ "$NODE_INDEX" = "4" ]; then
  echo "Running node $NODE_INDEX to test 'samples.circleci.node4' defined in pom.xml ..."
@@ -87,8 +87,8 @@ else
  echo "Running node $NODE_INDEX to test 'samples.circleci.others' defined in pom.xml ..."
  java -version

-  mvn --no-snapshot-updates --quiet verify -Psamples.circleci.others -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-  mvn --no-snapshot-updates --quiet javadoc:javadoc -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  ./mvnw --no-snapshot-updates --quiet verify -Psamples.circleci.others -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  ./mvnw --no-snapshot-updates --quiet javadoc:javadoc -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
 fi


--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 [![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/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">
@@ -59,6 +59,7 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [<img src="https://openapi-generator.tech/img/companies/burkert.jpg" width="128" height="128">](https://www.burkert.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<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)

 #### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS and Checkly for sponsoring the API monitoring

@@ -72,7 +73,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se

 |                                  | 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, 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 (2.x - 15.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs), **XoJo** |
+| **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/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
@@ -114,13 +115,15 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20

 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 7.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.0.0-SNAPSHOT/) | May/Jun 2023   | Major release with breaking changes (no 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

+(We do not publish daily/nightly build. Please use SNAPSHOT instead)
+
 For old releases, please refer to the [**Release**](https://github.com/OpenAPITools/openapi-generator/releases) page.

 For decomissioned generators/libraries/frameworks, please refer to [the "Decommission" label](https://github.com/OpenAPITools/openapi-generator/issues?q=label%3ADecommission+is%3Amerged+) in the pull request page.
@@ -173,7 +176,7 @@ See the different versions of the [openapi-generator-cli](https://search.maven.o

 ### [1.3 - Download JAR](#table-of-contents)
 <!-- RELEASE_VERSION -->
-If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum):
+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/6.6.0/openapi-generator-cli-6.6.0.jar`

@@ -189,11 +192,12 @@ Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/mav

 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.

-For Mac users, please make sure Java 8 is installed (Tips: run `java -version` to check the version), and export `JAVA_HOME` in order to use the supported Java version:
+For Mac users, please make sure Java 11 is installed (Tips: run `java -version` to check the version), and export `JAVA_HOME` in order to use the supported Java version:
 ```sh
-export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
+export JAVA_HOME=`/usr/libexec/java_home -v 1.11`
 export PATH=${JAVA_HOME}/bin:$PATH
 ```
+
 <!-- /RELEASE_VERSION -->
 ### Launcher Script

@@ -242,19 +246,14 @@ openapi-generator-cli version # is always 4.0.2, unless any of the above overrid

 To build from source, you need the following installed and available in your `$PATH:`

-* [Java 8](https://www.oracle.com/technetwork/java/index.html)
+* [Java 11](https://adoptium.net/)

-* [Apache Maven 3.3.4 or greater](https://maven.apache.org/)
+* [Apache Maven 3.3.4 or greater](https://maven.apache.org/) (optional)

-After cloning the project, you can build it from source with this command:
-```sh
-mvn clean install
-```
+After cloning the project, you can build it from source using [maven wrapper](https://github.com/takari/maven-wrapper):

-If you don't have maven installed, you may directly use the included [maven wrapper](https://github.com/takari/maven-wrapper), and build with the command:
-```sh
-./mvnw clean install
-```
+- Linux: `./mvnw clean install`
+- Windows: `mvnw.cmd clean install`

 #### Nix users

@@ -262,7 +261,7 @@ If you're a nix user, you can enter OpenAPI Generator shell, by typing:
 ```sh
 nix develop
 ```
-It will enter a shell with Java 8 and Maven installed.
+It will enter a shell with Java 11 installed.

 Direnv supports automatically loading of the nix developer shell, so if you're using direnv too, type:
 ```sh
@@ -272,9 +271,8 @@ and have `java` and `mvn` set up with correct versions each time you enter proje

 The default build contains minimal static analysis (via CheckStyle). To run your build with PMD and Spotbugs, use the `static-analysis` profile:

-```sh
-mvn -Pstatic-analysis clean install
-```
+- Linux: `./mvnw -Pstatic-analysis clean install`
+- Windows: `mvnw.cmd -Pstatic-analysis clean install`

 ### [1.5 - Homebrew](#table-of-contents)

@@ -290,11 +288,13 @@ To reinstall with the latest master, run `brew uninstall openapi-generator && br
 To install OpenJDK (pre-requisites), please run
 ```sh
 brew tap AdoptOpenJDK/openjdk
-brew install --cask adoptopenjdk12
-export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-12.0.2.jdk/Contents/Home/
+brew install --cask adoptopenjdk11
+export JAVA_HOME=`/usr/libexec/java_home -v 1.11`
 ```

-To install Maven, please run
+or download installer via https://adoptium.net/
+
+To install Maven (optional), please run
 ```sh
 brew install maven
 ```
@@ -377,19 +377,18 @@ Once built, `run-in-docker.sh` will act as an executable for openapi-generator-c
 ```sh
 ./run-in-docker.sh help # Executes 'help' command for openapi-generator-cli
 ./run-in-docker.sh list # Executes 'list' command for openapi-generator-cli
-./run-in-docker.sh /gen/bin/go-petstore.sh  # Builds the Go client
 ./run-in-docker.sh generate -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
    -g go -o /gen/out/go-petstore -p packageName=petstore # generates go client, outputs locally to ./out/go-petstore
 ```

 ##### Troubleshooting

-If an error like this occurs, just execute the **mvn clean install -U** command:
+If an error like this occurs, just execute the **./mvnw clean install -U** command:

 > org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test (default-test) on project openapi-generator: A type incompatibility occurred while executing org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test: java.lang.ExceptionInInitializerError cannot be cast to java.io.IOException

 ```sh
-./run-in-docker.sh mvn clean install -U
+./run-in-docker.sh ./mvnw clean install -U
 ```

 > Failed to execute goal org.fortasoft:gradle-maven-plugin:1.0.8:invoke (default) on project openapi-generator-gradle-plugin-mvn-wrapper: org.gradle.tooling.BuildException: Could not execute build using Gradle distribution 'https://services.gradle.org/distributions/gradle-4.7-bin.zip'
@@ -404,7 +403,7 @@ cd openapi-generator
 vagrant up
 vagrant ssh
 cd /vagrant
-./run-in-docker.sh mvn package
+./run-in-docker.sh ./mvnw package
 ```

 ### [1.7 - NPM](#table-of-contents)
@@ -438,7 +437,7 @@ To generate a PHP client for [petstore.yaml](https://raw.githubusercontent.com/o
 ```sh
 git clone https://github.com/openapitools/openapi-generator
 cd openapi-generator
-mvn clean package
+./mvnw clean package
 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 \
@@ -591,6 +590,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Adyen](https://www.adyen.com/)
 - [Agoda](https://www.agoda.com/)
 - [Airthings](https://www.airthings.com/)
+- [Aleri Solutions Gmbh](https://www.aleri.de/)
 - [Allianz](https://www.allianz.com)
 - [Angular.Schule](https://angular.schule/)
 - [Aqovia](https://aqovia.com/)
@@ -650,6 +650,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Klarna](https://www.klarna.com/)
 - [Kronsoft Development](https://www.kronsoft.ro/home/)
 - [Kubernetes](https://kubernetes.io)
+- [Landeshauptstadt München - it@M](https://muenchen.digital/it-at-m/)
 - [Linode](https://www.linode.com/)
 - [Logicdrop](https://www.logicdrop.com)
 - [Lumeris](https://www.lumeris.com)
@@ -903,6 +904,12 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2023-03-19 - [EXOGEM: Extending OpenAPI Generator for Monitoring of RESTful APIs](https://link.springer.com/chapter/10.1007/978-3-031-26507-5_10) by Daniel Friis Holtebo, Jannik Lucas Sommer, Magnus Mølgaard Lund, Alessandro Tibo, Junior Dongo & Michele Albano at "ICSOC 2022: Service-Oriented Computing – ICSOC 2022 Workshops"
 - 2023-03-28 - [API-First Design with OpenAPI Generator](https://www.linkedin.com/pulse/api-first-design-openapi-generator-jonathan-manera/) by [Jonathan Manera](https://www.linkedin.com/in/manerajona/)
 - 2023-03-28 - [ハンズオンで学ぶサーバーサイド Kotlin（Spring Boot&Arrow&OpenAPI Generator）v1.0.1](https://zenn.dev/msksgm/books/implementing-server-side-kotlin-development) by [msk](https://zenn.dev/msksgm)
+- 2023-04-01 - [OpenAPI Client Code Generation](https://testingboss.com/blog/openapi-client-generation/) by Kwo Ding
+- 2023-04-27 - [Create an Angular Client using OpenAPI Specifications](Create an Angular Client using OpenAPI Specifications) by [Patric](https://pguso.medium.com/)
+- 2023-05-16 - [Adyen for Java developers](https://www.adyen.com/blog/adyen-java-library) by [Beppe Catanese, Developer Advocate, Adyen](https://github.com/gcatanese)
+- 2023-05-18 - [如何基于 Swagger 使用 OpenAPI Generator 生成 JMeter 脚本？](https://blog.51cto.com/u_15181572/6294974) by [高楼（Zee)](https://blog.51cto.com/u_15181572)
+- 2023-06-28 - [Generate API contract using OpenAPI Generator Maven plugin](https://huongdanjava.com/generate-api-contract-using-openapi-generator-maven-plugin.html) by [Khanh Nguyen](https://huongdanjava.com/)
+- 2023-06-30 - [Generate Client SDKs with OpenApi Generator in Springboot](https://medium.com/@ramavathvinayak/generate-client-sdks-with-openapi-generator-in-springboot-f9f012e73c0b) by [Vinayak Ramavath](https://medium.com/@ramavathvinayak)

 ## [6 - About Us](#table-of-contents)

@@ -1003,10 +1010,12 @@ Here is a list of template creators:
   * Scala (scalaz & http4s): @tbrown1979
   * Scala (Akka): @cchafer
   * Scala (sttp): @chameleon82
+   * Scala (sttp4): @flsh86
   * Swift: @tkqubo
   * Swift 3: @hexelon
   * Swift 4: @ehyche
   * Swift 5: @4brunu
+   * Swift Combine: @dydus0x14
   * TypeScript (Angular1): @mhardorf
   * TypeScript (Angular2): @roni-frantchi
   * TypeScript (Angular6): @akehir
@@ -1020,6 +1029,7 @@ Here is a list of template creators:
   * TypeScript (Rxjs): @denyo
   * TypeScript (redux-query): @petejohansonxo
   * Xojo: @Topheee
+   * Zapier: @valmoz, @emajo
 * Server Stubs
   * Ada: @stcarrez
   * C# ASP.NET 5: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
@@ -1129,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) @frankyjuang (2019/09) @shibayan (2020/02) @Blackclaws (2021/03) @lucamazzanti (2021/05)                                                                                                                                          |
+| 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)                                                                                                        |
@@ -1147,7 +1157,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | JMeter                | @kannkyo (2021/01)                                                                                                                                                                                                                                    |
 | Jetbrains HTTP Client | @jlengrand (2023/01)                                                                                                                                                                                                                                  |
 | Julia                 | @tanmaykm (2023/01)                                                                                                                                                                                                                                   |
-| Kotlin                | @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)                                                        |
+| Kotlin                | @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03) @stefankoppier (2022/06)                                                        |
 | Lua                   | @daurnimator (2017/08)                                                                                                                                                                                                                                |
 | N4JS                  | @mmews-n4 (2023/03)                                                                                                                                                                                      |
 | Nim                   |                                                                                                                                                                                                                                                       |
@@ -1161,8 +1171,8 @@ If you want to join the committee, please kindly apply by sending an email to te
 | 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)                                                                                                                                                |
-| Scala                 | @clasnake (2017/07), @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @shijinkui  (2018/01), @ramzimaalej (2018/03), @chameleon82 (2020/03), @Bouillie (2020/04)                                                                |
-| Swift                 | @jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) @4brunu (2019/11)                                                                                                                                                           |
+| Scala                 | @clasnake (2017/07), @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @shijinkui  (2018/01), @ramzimaalej (2018/03), @chameleon82 (2020/03), @Bouillie (2020/04) @fish86 (2023/06)                                                               |
+| Swift                 | @jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) @4brunu (2019/11) @dydus0x14 (2023/06)                                                                                                                                                           |
 | TypeScript            | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02) @davidgamero (2022/03) @mkusaka (2022/04) |
 | Xojo                  | @Topheee (2023/04)                                                                                                                                                                                                                                    |

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,54 +25,41 @@ build_script:
  ## build C# aspnetcore 2.2 server
  #- dotnet build samples\server\petstore\aspnetcore\Org.OpenAPITools.sln
  ## build C# API client (multiple frameworks)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCoreAndNet47\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClientCoreAndNet47\Org.OpenAPITools.sln
  ## build C# API client (httpclient)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-httpclient\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-httpclient\Org.OpenAPITools.sln
  ## build C# API client (generichost)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-generichost-netstandard2.0\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-generichost-netstandard2.0\Org.OpenAPITools.sln
  ## build C# API client (netcore)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient\Org.OpenAPITools.sln
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCore\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClientCore\Org.OpenAPITools.sln
  ## build C# API client (.net framework 4.7)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net47\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-net47\Org.OpenAPITools.sln
  ## build C# API client (.net framework 4.8)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net48\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-net48\Org.OpenAPITools.sln
  ## build C# API client (.net 5.0)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-net5.0\Org.OpenAPITools.sln
  ## build C# API client (.net 5.0 with ConditionalSerialization)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln

-  ## build C# API client
-  #- nuget restore samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln
-  #- msbuild samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  ## build C# API client (with PropertyChanged)
-  #- nuget restore samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\Org.OpenAPITools.sln
-  #- msbuild samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  # build C# .net standard 1.3+ API client
-  #- nuget restore samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln
-  #- msbuild samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 test_script:
  # test c# API client (multiple frameworks)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCoreAndNet47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClientCoreAndNet47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  # test c# API client (httpclient)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-httpclient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-httpclient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  # test c# API client (generichost)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-generichost-netstandard2.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-generichost-netstandard2.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  # test c# API client (netcore)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  #- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  #- dotnet test samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  # test C# API client (.net framework 4.7)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  # test C# API client (.net framework 4.8)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net48\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-net48\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  # test C# API client (.net 5.0)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  # test C# API Client using conditional-serialization
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  ## test c# API client
-  #- nunit3-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
-  ## test c# API client (with PropertyChanged)
-  #- nunit3-console samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj

 ### TODO: Execute all generators via powershell or other
  # generate all petstore clients
--- a/bin/configs/ada.yaml
+++ b/bin/configs/ada.yaml
@@ -0,0 +1,15 @@
+generatorName: ada
+outputDir: samples/client/petstore/ada
+inputSpec: modules/openapi-generator/src/test/resources/3_0/ada/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/Ada
+nameMappings:
+  _type: P_UnderscoreType
+  type_: P_TypeWithUnderscore
+  http_debug_operation: P_HTTPDebugOperation
+parameterNameMappings:
+  _type: UnderscoreType
+  type_: TypeWithUnderscore
+  http_debug_operation: HttpDebugOperation 
+additionalProperties:
+  modelPackage: Samples.Petstore
+  projectName: Petstore
--- a/bin/configs/csharp-OpenAPIClient.yaml
+++ b/bin/configs/csharp-OpenAPIClient.yaml
@@ -1,6 +0,0 @@
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/OpenAPIClient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
--- a/bin/configs/csharp-functions-latest.yaml
+++ b/bin/configs/csharp-functions-latest.yaml
@@ -0,0 +1,7 @@
+generatorName: csharp-functions
+outputDir: samples/client/petstore/csharp-functions
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp-functions
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  userSecretsGuid: "76e9e993-9159-441c-9c5b-fe95e7f4f020"
--- a/bin/configs/csharp-generichost-latest-allOf.yaml
+++ b/bin/configs/csharp-generichost-latest-allOf.yaml
@@ -0,0 +1,11 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf
+inputSpec: modules/openapi-generator/src/test/resources/3_0/allOf.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: true
--- a/bin/configs/csharp-generichost-latest-anyOf.yaml
+++ b/bin/configs/csharp-generichost-latest-anyOf.yaml
@@ -0,0 +1,11 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf
+inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: true
--- a/bin/configs/csharp-generichost-latest-nrt.yaml
+++ b/bin/configs/csharp-generichost-latest-nrt.yaml
@@ -0,0 +1,11 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt
+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
+  nullableReferenceTypes: true
--- a/bin/configs/csharp-generichost-latest-oneOf.yaml
+++ b/bin/configs/csharp-generichost-latest-oneOf.yaml
@@ -0,0 +1,11 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf
+inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: true
--- a/bin/configs/csharp-generichost-latest.yaml
+++ b/bin/configs/csharp-generichost-latest.yaml
@@ -0,0 +1,11 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0
+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
+  nullableReferenceTypes: false
--- a/bin/configs/csharp-generichost-netstandard2.0.yaml
+++ b/bin/configs/csharp-generichost-netstandard2.0.yaml
@@ -0,0 +1,11 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0
+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
+  targetFramework: netstandard2.0
--- a/bin/configs/csharp-httpclient-netstandard2.0.yaml
+++ b/bin/configs/csharp-httpclient-netstandard2.0.yaml
@@ -0,0 +1,12 @@
+# for .net standard httpclient
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-httpclient
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+library: httpclient
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  useOneOfDiscriminatorLookup: true
+  targetFramework: netstandard2.0
--- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-allOf.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-allOf.yaml
@@ -1,12 +0,0 @@
-# for csharp-netcore generichost
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf
-inputSpec: modules/openapi-generator/src/test/resources/3_0/allOf.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  targetFramework: net7.0
-  nullableReferenceTypes: true
--- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-anyOf.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-anyOf.yaml
@@ -1,12 +0,0 @@
-# for csharp-netcore generichost
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf
-inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  targetFramework: net7.0
-  nullableReferenceTypes: true
--- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-oneOf.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-oneOf.yaml
@@ -1,12 +0,0 @@
-# for csharp-netcore generichost
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  targetFramework: net7.0
-  nullableReferenceTypes: true
--- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0-nrt.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0-nrt.yaml
@@ -1,12 +0,0 @@
-# for csharp-netcore generichost
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt
-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-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  targetFramework: net7.0
-  nullableReferenceTypes: true
--- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml
@@ -1,12 +0,0 @@
-# for csharp-netcore generichost
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0
-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-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  targetFramework: net7.0
-  nullableReferenceTypes: false
--- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netstandard2.0.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-generichost-netstandard2.0.yaml
@@ -1,11 +0,0 @@
-# for csharp-netcore generichost
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0
-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-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  targetFramework: netstandard2.0
--- a/bin/configs/csharp-netcore-OpenAPIClient-httpclient.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-httpclient.yaml
@@ -1,12 +0,0 @@
-# for .net standard httpclient
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-library: httpclient
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
-  targetFramework: netstandard2.0
--- a/bin/configs/csharp-netcore-OpenAPIClient-net47.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-net47.yaml
@@ -1,12 +0,0 @@
-# for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net47
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
-  targetFramework: net47
-  skipOneOfAnyOfGetter: true
--- a/bin/configs/csharp-netcore-OpenAPIClient-net48.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-net48.yaml
@@ -1,11 +0,0 @@
-# for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net48
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
-  targetFramework: net48
--- a/bin/configs/csharp-netcore-OpenAPIClient-net50.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-net50.yaml
@@ -1,11 +0,0 @@
-# for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
-  targetFramework: net7.0
--- a/bin/configs/csharp-netcore-OpenAPIClient-unityWebRequest.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient-unityWebRequest.yaml
@@ -1,6 +0,0 @@
-# for .net Unity
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-library: unityWebRequest
--- a/bin/configs/csharp-netcore-OpenAPIClient.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient.yaml
@@ -1,10 +0,0 @@
-# for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
--- a/bin/configs/csharp-netcore-OpenAPIClientCore.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClientCore.yaml
@@ -1,8 +0,0 @@
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClientCore
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  targetFramework: net7.0
-  useCompareNetObjects: "true"
--- a/bin/configs/csharp-netcore-OpenAPIClientCoreAndNet47.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClientCoreAndNet47.yaml
@@ -1,8 +0,0 @@
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  targetFramework: netstandard2.1;net47
-  useCompareNetObjects: "true"
--- a/bin/configs/csharp-netcore-OpenAPIClient_ConditionalSerialization.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClient_ConditionalSerialization.yaml
@@ -1,12 +0,0 @@
-# for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{fa96c953-af24-457d-8a01-f2fd2a7547a9}'
-  useCompareNetObjects: true 
-  disallowAdditionalPropertiesIfNotPresent: false
-  useOneOfDiscriminatorLookup: true
-  targetFramework:  netstandard2.0
-  conditionalSerialization: true
--- a/bin/configs/csharp-netcore-complex-files.yaml
+++ b/bin/configs/csharp-netcore-complex-files.yaml
@@ -1,10 +0,0 @@
-generatorName: csharp-netcore
-outputDir: samples/client/others/csharp-netcore-complex-files
-inputSpec: modules/openapi-generator/src/test/resources/3_0/form-multipart-binary-array.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  targetFramework: netstandard2.0
-  useCompareNetObjects: "true"
-globalProperties:
-  skipFormModel: "false"
--- a/bin/configs/csharp-netcore-functions.yaml
+++ b/bin/configs/csharp-netcore-functions.yaml
@@ -1,7 +0,0 @@
-generatorName: csharp-netcore-functions
-outputDir: samples/client/petstore/csharp-netcore-functions
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore-functions
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  userSecretsGuid: "76e9e993-9159-441c-9c5b-fe95e7f4f020"
--- a/bin/configs/csharp-restsharp-echo-api.yaml
+++ b/bin/configs/csharp-restsharp-echo-api.yaml
@@ -0,0 +1,9 @@
+generatorName: csharp
+outputDir: samples/client/echo_api/csharp-restsharp
+inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{322C8CAF-0156-40C1-AE42-D59761FB9B6C}'
+  targetFramework: net6.0
+  setCompareNetObjects: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/csharp-restsharp-name-mappings.yaml
+++ b/bin/configs/csharp-restsharp-name-mappings.yaml
@@ -0,0 +1,15 @@
+generatorName: csharp
+outputDir: samples/client/petstore/csharp-restsharp-name-parameter-mappings
+inputSpec: modules/openapi-generator/src/test/resources/3_0/name-parameter-mappings.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+nameMappings:
+  _type: UnderscoreType
+  type_: TypeWithUnderscore
+  http_debug_operation: HttpDebugOperation
+parameterNameMappings:
+  _type: UnderscoreType
+  type_: TypeWithUnderscore
+  http_debug_operation: HttpDebugOperation
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  hideGenerationTimestamp: "true"
--- a/bin/configs/csharp-restsharp-net4.7-multipleFrameworks.yaml
+++ b/bin/configs/csharp-restsharp-net4.7-multipleFrameworks.yaml
@@ -0,0 +1,8 @@
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClientCoreAndNet47
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  targetFramework: netstandard2.1;net47
+  useCompareNetObjects: "true"
--- a/bin/configs/csharp-restsharp-net4.7.yaml
+++ b/bin/configs/csharp-restsharp-net4.7.yaml
@@ -0,0 +1,12 @@
+# for .net standard
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-net47
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  useOneOfDiscriminatorLookup: true
+  targetFramework: net47
+  skipOneOfAnyOfGetter: true
--- a/bin/configs/csharp-restsharp-net4.8.yaml
+++ b/bin/configs/csharp-restsharp-net4.8.yaml
@@ -0,0 +1,11 @@
+# for .net standard
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-net48
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  useOneOfDiscriminatorLookup: true
+  targetFramework: net48
--- a/bin/configs/csharp-restsharp-net7.0-compareNetObjects.yaml
+++ b/bin/configs/csharp-restsharp-net7.0-compareNetObjects.yaml
@@ -0,0 +1,8 @@
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClientCore
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  targetFramework: net7.0
+  useCompareNetObjects: "true"
--- a/bin/configs/csharp-restsharp-net7.0.yaml
+++ b/bin/configs/csharp-restsharp-net7.0.yaml
@@ -0,0 +1,11 @@
+# for .net standard
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-net5.0
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  useOneOfDiscriminatorLookup: true
+  targetFramework: net7.0
--- a/bin/configs/csharp-restsharp-netstandard2.0-complexfiles.yaml
+++ b/bin/configs/csharp-restsharp-netstandard2.0-complexfiles.yaml
@@ -0,0 +1,10 @@
+generatorName: csharp
+outputDir: samples/client/others/csharp-complex-files
+inputSpec: modules/openapi-generator/src/test/resources/3_0/form-multipart-binary-array.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  targetFramework: netstandard2.0
+  useCompareNetObjects: "true"
+globalProperties:
+  skipFormModel: "false"
--- a/bin/configs/csharp-restsharp-netstandard2.0-conditionalSerialization.yaml
+++ b/bin/configs/csharp-restsharp-netstandard2.0-conditionalSerialization.yaml
@@ -0,0 +1,12 @@
+# for .net standard
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{fa96c953-af24-457d-8a01-f2fd2a7547a9}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  useOneOfDiscriminatorLookup: true
+  targetFramework:  netstandard2.0
+  conditionalSerialization: true
--- a/bin/configs/csharp-restsharp-netstandard2.0.yaml
+++ b/bin/configs/csharp-restsharp-netstandard2.0.yaml
@@ -0,0 +1,11 @@
+# for .net standard
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  useOneOfDiscriminatorLookup: true
+  targetFramework: netstandard2.0
--- a/bin/configs/csharp-unityWebRequest-netstandard2.0.yaml
+++ b/bin/configs/csharp-unityWebRequest-netstandard2.0.yaml
@@ -0,0 +1,8 @@
+# for .net Unity
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-unityWebRequest
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+library: unityWebRequest
+additionalProperties:
+  targetFramework: netstandard2.0
--- a/bin/configs/go-echo-server-petstore-new.yaml
+++ b/bin/configs/go-echo-server-petstore-new.yaml
@@ -2,5 +2,8 @@ generatorName: go-echo-server
 outputDir: samples/server/petstore/go-echo-server
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/go-echo-server
+gitHost: gitlab.com
+gitUserId: openapitools
+gitRepoId: petstore
 additionalProperties:
  hideGenerationTimestamp: "true"
--- a/bin/configs/go-petstore.yaml
+++ b/bin/configs/go-petstore.yaml
@@ -2,8 +2,17 @@ generatorName: go
 outputDir: samples/openapi3/client/petstore/go/go-petstore
 inputSpec: modules/openapi-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
 templateDir: modules/openapi-generator/src/main/resources/go
+nameMappings:
+  _type: UnderscoreType
+  type_: TypeWithUnderscore
+  http_debug_operation: HTTPDebugOperation
+parameterNameMappings:
+  _type: underscoreType
+  type_: typeWithUnderscore
+  http_debug_operation: httpDebugOperation
 additionalProperties:
  enumClassPrefix: "true"
  packageName: petstore
  disallowAdditionalPropertiesIfNotPresent: false
  generateInterfaces: true
+
--- a/bin/configs/java-jersey2-8-swagger2.yaml
+++ b/bin/configs/java-jersey2-8-swagger2.yaml
@@ -0,0 +1,14 @@
+generatorName: java
+outputDir: samples/openapi3/client/petstore/java/jersey2-java8-swagger2
+library: jersey2
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: petstore-openapi3-jersey2-java8
+  hideGenerationTimestamp: true
+  serverPort: "8082"
+  dateLibrary: java8
+  useOneOfDiscriminatorLookup: true
+  disallowAdditionalPropertiesIfNotPresent: false
+  gradleProperties: "\n# JVM arguments\norg.gradle.jvmargs=-Xmx2024m -XX:MaxPermSize=512m\n# set timeout\norg.gradle.daemon.idletimeout=3600000\n# show all warnings\norg.gradle.warning.mode=all"
+  annotationLibrary: "swagger2"
--- a/bin/configs/java-okhttp-gson-swagger2.yaml
+++ b/bin/configs/java-okhttp-gson-swagger2.yaml
@@ -0,0 +1,12 @@
+generatorName: java
+outputDir: samples/client/petstore/java/okhttp-gson-swagger2
+library: okhttp-gson
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: petstore-okhttp-gson
+  hideGenerationTimestamp: "true"
+  useOneOfDiscriminatorLookup: "true"
+  disallowAdditionalPropertiesIfNotPresent: false
+  annotationLibrary: "swagger2"
+
--- a/bin/configs/java-okhttp-gson.yaml
+++ b/bin/configs/java-okhttp-gson.yaml
@@ -3,6 +3,12 @@ outputDir: samples/client/petstore/java/okhttp-gson
 library: okhttp-gson
 inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
 templateDir: modules/openapi-generator/src/main/resources/Java
+nameMappings:
+  _type: underscoreType
+  type_: typeWithUnderscore
+parameterNameMappings:
+  _type: underscoreType
+  type_: typeWithUnderscore
 additionalProperties:
  artifactId: petstore-okhttp-gson
  hideGenerationTimestamp: "true"
--- a/bin/configs/java-resttemplate-swagger2.yaml
+++ b/bin/configs/java-resttemplate-swagger2.yaml
@@ -0,0 +1,10 @@
+generatorName: java
+outputDir: samples/client/petstore/java/resttemplate-swagger2
+library: resttemplate
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: petstore-resttemplate
+  hideGenerationTimestamp: "true"
+  annotationLibrary: "swagger2"
+  java8: true
--- a/bin/configs/java-webclient-swagger2.yaml
+++ b/bin/configs/java-webclient-swagger2.yaml
@@ -0,0 +1,10 @@
+generatorName: java
+outputDir: samples/client/petstore/java/webclient-swagger2
+library: webclient
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: petstore-webclient
+  hideGenerationTimestamp: "true"
+  containerDefaultToNull: "true"
+  annotationLibrary: "swagger2"
--- a/bin/configs/julia-client-petstore-new.yaml
+++ b/bin/configs/julia-client-petstore-new.yaml
@@ -4,4 +4,6 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/julia-client
 additionalProperties:
  hideGenerationTimestamp: "true"
-  packageName: PetStoreClient
+  packageName: OpenAPIGenPetStoreClient
+  exportOperations: "true"
+  exportModels: "true"
--- a/bin/configs/julia-server-petstore-new.yaml
+++ b/bin/configs/julia-server-petstore-new.yaml
@@ -4,4 +4,6 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/julia-server
 additionalProperties:
  hideGenerationTimestamp: "true"
-  packageName: PetStoreServer
+  packageName: OpenAPIGenPetStoreServer
+  exportOperations: "true"
+  exportModels: "true"
--- a/bin/configs/kotlin-jvm-ktor-kotlinx_serialization.yaml
+++ b/bin/configs/kotlin-jvm-ktor-kotlinx_serialization.yaml
@@ -0,0 +1,8 @@
+generatorName: kotlin
+outputDir: samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization
+library: jvm-ktor
+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-ktor-kotlinx_serialization
+  serializationLibrary: kotlinx_serialization
--- a/bin/configs/kotlin-name-mappings.yaml
+++ b/bin/configs/kotlin-name-mappings.yaml
@@ -0,0 +1,14 @@
+generatorName: kotlin
+outputDir: samples/client/petstore/kotlin-name-parameter-mappings
+inputSpec: modules/openapi-generator/src/test/resources/3_0/name-parameter-mappings.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+nameMappings:
+  _type: underscoreType
+  type_: typeWithUnderscore
+  http_debug_operation: httpDebugOperation
+parameterNameMappings:
+  _type: underscoreType
+  type_: typeWithUnderscore
+  http_debug_operation: httpDebugOperation
+additionalProperties:
+  artifactId: kotlin-petstore-client
--- a/bin/configs/python-fastapi.yaml
+++ b/bin/configs/python-fastapi.yaml
@@ -1,6 +1,6 @@
 generatorName: python-fastapi
 outputDir: samples/server/petstore/python-fastapi
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/python-fastapi/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/python-fastapi
 sourceFolder: "src"
 additionalProperties:
--- a/bin/configs/python.yaml
+++ b/bin/configs/python.yaml
@@ -7,3 +7,6 @@ additionalProperties:
  useOneOfDiscriminatorLookup: "true"
  disallowAdditionalPropertiesIfNotPresent: false
  mapNumberTo: StrictFloat
+nameMappings:
+  _type: underscore_type
+  type_: type_with_underscore
--- a/bin/configs/ruby.yaml
+++ b/bin/configs/ruby.yaml
@@ -1,7 +1,7 @@
 generatorName: ruby
 outputDir: samples/client/petstore/ruby
 library: typhoeus
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/ruby/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/ruby-client
 additionalProperties:
  gemVersion: 1.0.0
@@ -9,3 +9,9 @@ additionalProperties:
  gemName: petstore
  skipFormModel: "true"
 strictSpecBehavior: false
+nameMappings:
+  _type: underscore_type
+  type_: type_with_underscore
+parameterNameMappings:
+  _type: underscore_type
+  type_: type_with_underscore
--- a/bin/configs/rust-reqwest-regression-16119.yaml
+++ b/bin/configs/rust-reqwest-regression-16119.yaml
@@ -0,0 +1,8 @@
+generatorName: rust
+outputDir: samples/client/others/rust/reqwest-regression-16119
+library: reqwest
+inputSpec: modules/openapi-generator/src/test/resources/3_1/regression-16119.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust
+additionalProperties:
+  supportAsync: false
+  packageName: regression-16119-reqwest
--- a/bin/configs/scala-sttp.yaml
+++ b/bin/configs/scala-sttp.yaml
@@ -2,5 +2,13 @@ generatorName: scala-sttp
 outputDir: samples/client/petstore/scala-sttp
 inputSpec: modules/openapi-generator/src/test/resources/3_0/scala/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/scala-sttp
+nameMappings:
+  _type: "`underscoreType`"
+  type_: "`typeWithUnderscore`"
+  http_debug_operation: "`httpDebugOperation`"
+parameterNameMappings:
+  _type: underscoreType
+  type_: typeWithUnderscore
+  http_debug_operation: httpDebugOperation
 additionalProperties:
  artifactId: scala-sttp-petstore
--- a/bin/configs/scala-sttp4.yaml
+++ b/bin/configs/scala-sttp4.yaml
@@ -0,0 +1,6 @@
+generatorName: scala-sttp4
+outputDir: samples/client/petstore/scala-sttp4
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/scala-sttp4
+additionalProperties:
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-cloud-3-with-optional.yaml
+++ b/bin/configs/spring-cloud-3-with-optional.yaml
@@ -0,0 +1,14 @@
+generatorName: spring
+library: spring-cloud
+outputDir: samples/openapi3/client/petstore/spring-cloud-3-with-optional
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  artifactId: spring-cloud-oas3
+  useSpringBoot3: "true"
+  dateLibrary: "java8"
+  useOptional: "true"
+  useSwaggerUI: "false"
+  hideGenerationTimestamp: "true"
+  documentationProvider: none
--- a/bin/configs/spring-cloud-3.yaml
+++ b/bin/configs/spring-cloud-3.yaml
@@ -8,6 +8,6 @@ additionalProperties:
  documentationProvider: springdoc
  artifactId: spring-cloud-oas3
  useSpringBoot3: "true"
-  interfaceOnly: "true"
+  interfaceOnly: "false"
  singleContentTypes: "true"
  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-cloud-date-time-oas3.yaml
+++ b/bin/configs/spring-cloud-date-time-oas3.yaml
@@ -9,4 +9,5 @@ additionalProperties:
  artifactId: spring-cloud-date-time-oas3
  interfaceOnly: "true"
  singleContentTypes: "true"
-  hideGenerationTimestamp: "true"
+  hideGenerationTimestamp: "true"
+  useTags: "true"
--- a/bin/configs/spring-cloud-date-time.yaml
+++ b/bin/configs/spring-cloud-date-time.yaml
@@ -8,4 +8,5 @@ additionalProperties:
  artifactId: spring-cloud-date-time
  interfaceOnly: "true"
  singleContentTypes: "true"
-  hideGenerationTimestamp: "true"
+  hideGenerationTimestamp: "true"
+  useTags: "true"
--- a/bin/configs/spring-cloud-oas3-fakeapi.yaml
+++ b/bin/configs/spring-cloud-oas3-fakeapi.yaml
@@ -11,3 +11,4 @@ additionalProperties:
  singleContentTypes: "true"
  hideGenerationTimestamp: "true"
  generatedConstructorWithRequiredArgs: "false"
+  useTags: "true"
--- a/bin/configs/spring-cloud-oas3.yaml
+++ b/bin/configs/spring-cloud-oas3.yaml
@@ -10,3 +10,4 @@ additionalProperties:
  interfaceOnly: "true"
  singleContentTypes: "true"
  hideGenerationTimestamp: "true"
+  useTags: "true"
--- a/bin/configs/spring-cloud-tags.yaml
+++ b/bin/configs/spring-cloud-tags.yaml
@@ -0,0 +1,13 @@
+generatorName: spring
+library: spring-cloud
+outputDir: samples/client/petstore/spring-cloud-tags
+inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-tags.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  documentationProvider: springfox
+  artifactId: spring-cloud-date-time
+  interfaceOnly: "true"
+  singleContentTypes: "true"
+  hideGenerationTimestamp: "true"
+  useTags: "false"
+  apiNameSuffix: "Controller"
--- a/bin/configs/spring-http-interface-reactive.yaml
+++ b/bin/configs/spring-http-interface-reactive.yaml
@@ -8,4 +8,11 @@ additionalProperties:
  snapshotVersion: "true"
  hideGenerationTimestamp: "true"
  reactive: "true"
+  # documentation provider should be ignored
+  documentationProvider: "springfox"
+  # annotation provider should be ignored
+  annotationLibrary: "swagger1"
+  # validation should be ignored
+  useBeanValidation: "true"
+  performBeanValidation: "true"

--- a/bin/configs/spring-http-interface.yaml
+++ b/bin/configs/spring-http-interface.yaml
@@ -9,3 +9,10 @@ additionalProperties:
  hideGenerationTimestamp: "true"
  modelNameSuffix: 'Dto'
  generatedConstructorWithRequiredArgs: "false"
+  # documentation provider should be ignored
+  documentationProvider: "springdoc"
+  # annotation provider should be ignored
+  annotationLibrary: "swagger2"
+  # validation should be ignored
+  useBeanValidation: "true"
+  performBeanValidation: "true"
--- a/bin/configs/swift-combine-petstore-new.yaml
+++ b/bin/configs/swift-combine-petstore-new.yaml
@@ -0,0 +1,7 @@
+generatorName: swift-combine
+outputDir: samples/client/petstore/swift-combine/client
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift-combine
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  projectName: "PetstoreOpenAPI"
--- a/bin/configs/swift5-any-codable.yaml
+++ b/bin/configs/swift5-any-codable.yaml
@@ -1,5 +1,5 @@
 generatorName: swift5
-outputDir: samples/client/petstore/swift5/anycodable
+outputDir: samples/client/petstore/swift5/anycodableLibrary
 inputSpec: modules/openapi-generator/src/test/resources/3_0/any_codable.yaml
 modelNamePrefix: Prefix
 modelNameSuffix: Suffix
--- a/bin/configs/typescript-angular-composed-schemas-tagged-unions.yaml
+++ b/bin/configs/typescript-angular-composed-schemas-tagged-unions.yaml
@@ -0,0 +1,9 @@
+generatorName: typescript-angular
+outputDir: samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions
+inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-angular/composed-schemas.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+additionalProperties:
+  stringEnums: true
+  modelSuffix: Model
+  enumSuffix: Enum
+  taggedUnions: true
--- a/bin/configs/typescript-angular-composed-schemas.yaml
+++ b/bin/configs/typescript-angular-composed-schemas.yaml
@@ -0,0 +1,8 @@
+generatorName: typescript-angular
+outputDir: samples/client/others/typescript-angular/builds/composed-schemas
+inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-angular/composed-schemas.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+additionalProperties:
+  stringEnums: true
+  modelSuffix: Model
+  enumSuffix: Enum
--- a/Show More
+++ b/Show More