Merge remote-tracking branch 'origin/master' into 6.0.x

2025-05-12 12:40:53 +00:00 · 2022-01-30 18:01:35 +08:00 · 2022-01-30 18:01:35 +08:00 · c8b84c4d03
commit c8b84c4d03
parent 9c3d4ef2a6 3ed6343933
4543 changed files with 127729 additions and 45908 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -1,16 +1,135 @@
-version: 2
+version: 2.1
+commands: # a reusable command with parameters
+  command_build_and_test:
+    parameters:
+      nodeNo:
+        default: "0"
+        type: string
+    steps:
+      # Restore the dependency cache
+      - restore_cache:
+          keys:
+            # Default branch if not
+            - source-v2-{{ .Branch }}-{{ .Revision }}
+            - source-v2-{{ .Branch }}-
+            - source-v2-
+      # Machine Setup
+      #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
+      # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
+      - checkout
+      # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
+      # In many cases you can simplify this from what is generated here.
+      # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
+      - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
+      # This is based on your 1.0 configuration file or project settings
+      - run:
+          command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV
+      - 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
+      #    - 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
+      - run: docker run --name petstore.swagger -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
+      - run: docker ps -a
+      - run: sleep 30
+      - run: cat /etc/hosts
+      # Test
+      - run: mvn --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
+      - run: ./CI/circle_parallel.sh
+      # Save dependency cache
+      - save_cache:
+          key: source-v2-{{ .Branch }}-{{ .Revision }}
+          paths:
+            # This is a broad list of cache paths to include many possible development environments
+            # You can probably delete some of these entries
+            - vendor/bundle
+            - ~/virtualenvs
+            - ~/.m2
+            - ~/.ivy2
+            - ~/.sbt
+            - ~/.bundle
+            - ~/.go_workspace
+            - ~/.gradle
+            - ~/.cache/bower
+            - ".git"
+            - ~/.stack
+            - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
+            - ~/R
+      # save "default" cache using the key "source-v2-"
+      - save_cache:
+          key: source-v2-
+          paths:
+            # This is a broad list of cache paths to include many possible development environments
+            # You can probably delete some of these entries
+            - vendor/bundle
+            - ~/virtualenvs
+            - ~/.m2
+            - ~/.ivy2
+            - ~/.sbt
+            - ~/.bundle
+            - ~/.go_workspace
+            - ~/.gradle
+            - ~/.cache/bower
+            - ".git"
+            - ~/.stack
+            - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
+            - ~/R
+      # Teardown
+      #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
+      # Save test results
+      - store_test_results:
+          path: /tmp/circleci-test-results
+      # Save artifacts
+      - store_artifacts:
+          path: /tmp/circleci-artifacts
+      - store_artifacts:
+          path: /tmp/circleci-test-results
+  command_docker_build_and_test:
+    parameters:
+      nodeNo:
+        default: "0"
+        type: string
+    steps:
+      # Machine Setup
+      #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
+      # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
+      - checkout
+      # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
+      # In many cases you can simplify this from what is generated here.
+      # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
+      - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
+      # This is based on your 1.0 configuration file or project settings
+      #      - run:
+      #          command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV
+      #      - run:
+      # Test
+      #      - run: mvn --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
+      - run: ./CI/circle_parallel.sh
+      # Teardown
+      #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
+      # Save test results
+      - store_test_results:
+          path: /tmp/circleci-test-results
+      # Save artifacts
+      - store_artifacts:
+          path: /tmp/circleci-artifacts
+      - store_artifacts:
+          path: /tmp/circleci-test-results
 jobs:
-  build:
-    #    docker:
-    #      #- image: openapitools/openapi-generator
-    #      - image: swaggerapi/petstore
-    #        environment:
-    #          SWAGGER_HOST=http://petstore.swagger.io
-    #          SWAGGER_BASE_PATH=/v2
+  node0:
    machine:
      image: circleci/classic:latest
    working_directory: ~/OpenAPITools/openapi-generator
-    parallelism: 4
    shell: /bin/bash --login
    environment:
      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
@ -18,85 +137,68 @@ jobs:
      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
    steps:
-    # Restore the dependency cache
-    - restore_cache:
-        keys:
-        # Default branch if not
-        - source-v2-{{ .Branch }}-{{ .Revision }}
-        - source-v2-{{ .Branch }}-
-        - source-v2-
-    # Machine Setup
-    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-    # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
-    - checkout
-    # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
-    # In many cases you can simplify this from what is generated here.
-    # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
-    - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
-    # This is based on your 1.0 configuration file or project settings
-    - run:
-        command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV
-    - 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
-#    - 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
-    - run: docker run --name petstore.swagger -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
-    - run: docker ps -a
-    - run: sleep 30
-    - run: cat /etc/hosts
-    # Test
-    - run: mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-    - run: ./CI/circle_parallel.sh 
-    # Save dependency cache
-    - save_cache:
-        key: source-v2-{{ .Branch }}-{{ .Revision }}
-        paths:
-        # This is a broad list of cache paths to include many possible development environments
-        # You can probably delete some of these entries
-        - vendor/bundle
-        - ~/virtualenvs
-        - ~/.m2
-        - ~/.ivy2
-        - ~/.sbt
-        - ~/.bundle
-        - ~/.go_workspace
-        - ~/.gradle
-        - ~/.cache/bower
-        - ".git"
-        - ~/.stack
-        - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
-        - ~/R
-    # save "default" cache using the key "source-v2-"
-    - save_cache:
-        key: source-v2-
-        paths:
-        # This is a broad list of cache paths to include many possible development environments
-        # You can probably delete some of these entries
-        - vendor/bundle
-        - ~/virtualenvs
-        - ~/.m2
-        - ~/.ivy2
-        - ~/.sbt
-        - ~/.bundle
-        - ~/.go_workspace
-        - ~/.gradle
-        - ~/.cache/bower
-        - ".git"
-        - ~/.stack
-        - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
-        - ~/R
-    # Teardown
-    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-    # Save test results
-    - store_test_results:
-        path: /tmp/circleci-test-results
-    # Save artifacts
-    - store_artifacts:
-        path: /tmp/circleci-artifacts
-    - store_artifacts:
-        path: /tmp/circleci-test-results
+      - command_build_and_test:
+          nodeNo: "0"
+  node1:
+    machine:
+      image: circleci/classic:latest
+    working_directory: ~/OpenAPITools/openapi-generator
+    shell: /bin/bash --login
+    environment:
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
+      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
+    steps:
+      - command_build_and_test:
+          nodeNo: "1"
+  node2:
+    machine:
+      image: circleci/classic:latest
+    working_directory: ~/OpenAPITools/openapi-generator
+    shell: /bin/bash --login
+    environment:
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
+      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
+    steps:
+      - command_build_and_test:
+          nodeNo: "2"
+  node3:
+    machine:
+      image: circleci/classic:latest
+    working_directory: ~/OpenAPITools/openapi-generator
+    shell: /bin/bash --login
+    environment:
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
+      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
+    steps:
+      - checkout
+      - command_build_and_test:
+          nodeNo: "3"
+  node4:
+    docker:
+      - image: fkrull/multi-python
+    working_directory: ~/OpenAPITools/openapi-generator
+    shell: /bin/bash --login
+    environment:
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
+      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
+    steps:
+      - checkout
+      - command_docker_build_and_test:
+          nodeNo: "4"
+workflows:
+  version: 2
+  build:
+    jobs:
+      - node0
+      - node1
+      - node2
+      - node3
+      - node4
--- a/.github/.test/samples.json
+++ b/.github/.test/samples.json
@ -710,18 +710,6 @@
        "Schema: MySQL"
      ]
    },
-    {
-      "input": "nancyfx-petstore-server-async.sh",
-      "matches": [
-        "Server: C-Sharp"
-      ]
-    },
-    {
-      "input": "nancyfx-petstore-server.sh",
-      "matches": [
-        "Server: C-Sharp"
-      ]
-    },
    {
      "input": "nodejs-petstore-google-cloud-functions.sh",
      "matches": [
--- a/.github/auto-labeler.yml
+++ b/.github/auto-labeler.yml
@ -220,8 +220,6 @@ labels:
    'Server: C-Sharp':
      - '\s*?\[aspnetcore\]\s*?'
      - '\s*?-[gl] aspnetcore\s*?'
-      - '\s*?\[csharp-nancyfx\]\s*?'
-      - '\s*?-[gl] csharp-nancyfx\s*?'
    # 'Server: Ceylon': # TODO: REMOVE UNUSED LABEL
    'Server: Eiffel':
      - '\s*?\[eiffel(-.*)?-server\]\s*?'
--- a/.github/workflows/samples-kotlin.yaml
+++ b/.github/workflows/samples-kotlin.yaml
@ -41,6 +41,7 @@ jobs:
          - samples/client/petstore/kotlin-string
          - samples/client/petstore/kotlin-threetenbp
          - samples/client/petstore/kotlin-uppercase-enum
+          - samples/client/petstore/kotlin-array-simple-string
    steps:
      - uses: actions/checkout@v2
      - uses: actions/setup-java@v2
--- a/.github/workflows/samples-spring.yaml
+++ b/.github/workflows/samples-spring.yaml
@ -0,0 +1,59 @@
+name: Samples Java Spring
+
+on:
+  push:
+    paths:
+      - 'samples/server/petstore/spring*/**'
+      - 'samples/openapi3/server/petstore/spring*/**'
+  pull_request:
+    paths:
+      - 'samples/server/petstore/spring*/**'
+      - 'samples/openapi3/server/petstore/spring*/**'
+jobs:
+  build:
+    name: Build Java Spring
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/petstore/spring-cloud
+          - samples/openapi3/client/petstore/spring-cloud
+          - samples/client/petstore/spring-cloud-date-time
+          - samples/openapi3/client/petstore/spring-cloud-date-time
+          - samples/client/petstore/spring-stubs
+          - samples/openapi3/client/petstore/spring-stubs
+          # servers
+          - samples/server/petstore/spring-mvc
+          - samples/server/petstore/spring-mvc-default-value
+          - samples/server/petstore/spring-mvc-j8-async
+          - samples/server/petstore/spring-mvc-j8-localdatetime
+          - samples/server/petstore/springboot
+          - samples/openapi3/server/petstore/springboot
+          - samples/server/petstore/springboot-beanvalidation
+          - samples/server/petstore/springboot-useoptional
+          - samples/openapi3/server/petstore/springboot-useoptional
+          - samples/server/petstore/springboot-reactive
+          - samples/openapi3/server/petstore/springboot-reactive
+          - samples/server/petstore/springboot-implicitHeaders
+          - samples/openapi3/server/petstore/springboot-implicitHeaders
+          - samples/server/petstore/springboot-delegate
+          - samples/openapi3/server/petstore/springboot-delegate
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Cache maven dependencies
+        uses: actions/cache@v2.1.7
+        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/.gitignore
+++ b/.gitignore
@ -201,15 +201,11 @@ samples/server/petstore/aspnetcore/.vs/
 effective.pom

 # kotlin
-samples/client/petstore/kotlin/src/main/kotlin/test/
-samples/client/petstore/kotlin-threetenbp/build
-samples/client/petstore/kotlin-string/build
 samples/openapi3/client/petstore/kotlin/build
 samples/server/petstore/kotlin-server/ktor/build
 samples/server/petstore/kotlin-springboot/build
-samples/client/petstore/kotlin-multiplatform/build/
-samples/client/petstore/kotlin-okhttp3/build/
-\?
+samples/client/petstore/kotlin*/src/main/kotlin/test/
+samples/client/petstore/kotlin*/build/

 # haskell
 .stack-work
--- a/.mvn/wrapper/maven-wrapper.jar
+++ b/.mvn/wrapper/maven-wrapper.jar
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# 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
--- a/CI/circle_parallel.sh
+++ b/CI/circle_parallel.sh
@ -11,7 +11,9 @@ export NODE_ENV=test

 function cleanup {
  # Show logs of 'petstore.swagger' container to troubleshoot Unit Test failures, if any.
-  docker logs petstore.swagger # container name specified in circle.yml
+  if [ "$NODE_INDEX" != "4" ]; then
+    docker logs petstore.swagger # container name specified in circle.yml
+  fi
 }

 trap cleanup EXIT
@ -59,8 +61,8 @@ elif [ "$NODE_INDEX" = "3" ]; then
  #sudo make altinstall
  pyenv install --list 
  pyenv install 3.6.3
+  pyenv install 2.7.14
  pyenv global 3.6.3
-  python3 --version

  # Install node@stable (for angular 6)
  set +e
@ -79,6 +81,20 @@ elif [ "$NODE_INDEX" = "3" ]; then

  mvn --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 ..."
+
+  # install maven and java so we can use them to run our tests
+  apt-get update && apt-get install -y default-jdk maven sudo
+  java -version
+  export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::")
+  echo $JAVA_HOME
+  # show os version
+  uname -a
+
+  mvn --no-snapshot-updates --quiet verify -Psamples.circleci.node4 -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+
 else
  echo "Running node $NODE_INDEX to test 'samples.circleci.others' defined in pom.xml ..."
  #sudo update-java-alternatives -s java-1.7.0-openjdk-amd64
--- a/README.md
+++ b/README.md
@ -68,8 +68,8 @@ 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.0, .NET Core 2.0, .NET 5.0. Libraries: RestSharp, 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, 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), **k6**, **Kotlin**, **Lua**, **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 - 11.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) |
-| **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, NancyFx, 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/)), **Kotlin** (Spring Boot, Ktor, Vertx), **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), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)                                                                                                                                                                                         |
+| **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, 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), **k6**, **Kotlin**, **Lua**, **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 - 11.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) |
+| **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, NancyFx, 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/)), **Kotlin** (Spring Boot, Ktor, Vertx), **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), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)                                                                                                                                                                                         |
 | **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | **Configuration files**          | [**Apache2**](https://httpd.apache.org/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**, **WSDL**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
@ -577,6 +577,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [ASKUL](https://www.askul.co.jp)
 - [Arduino](https://www.arduino.cc/)
 - [b<>com](https://b-com.com/en)
+- [百度营销](https://e.baidu.com)
 - [Banzai Cloud](https://banzaicloud.com)
 - [BIMData.io](https://bimdata.io)
 - [Bithost GmbH](https://www.bithost.ch)
@ -626,6 +627,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Lumeris](https://www.lumeris.com)
 - [LVM Versicherungen](https://www.lvm.de)
 - [MailSlurp](https://www.mailslurp.com)
+- [Manticore Search](https://manticoresearch.com)
 - [Médiavision](https://www.mediavision.fr/)
 - [Metaswitch](https://www.metaswitch.com/)
 - [MoonVision](https://www.moonvision.io/)
@ -852,10 +854,12 @@ OpenAPI Generator core team members are contributors who have been making signif
 * [@ackintosh](https://github.com/ackintosh) (2018/02) [:heart:](https://www.patreon.com/ackintosh/overview)
 * [@jmini](https://github.com/jmini) (2018/04)  [:heart:](https://www.patreon.com/jmini)
 * [@etherealjoy](https://github.com/etherealjoy) (2019/06)
-* [@spacether](https://github.com/spacether) (2020/05)
+* [@spacether](https://github.com/spacether) (2020/05) [:heart:][spacether sponsorship]

 :heart: = Link to support the contributor directly

+[spacether sponsorship]: https://github.com/sponsors/spacether/
+
 #### Template Creator

 **NOTE**: Embedded templates are only supported in _Mustache_ format. Support for all other formats is experimental and subject to change at any time.
@ -918,7 +922,8 @@ Here is a list of template creators:
   * PHP (with Data Transfer): @Articus
   * PowerShell: @beatcracker
   * PowerShell (refactored in 5.0.0): @wing328
-   * Python: @spacether
+   * Python: @spacether [:heart:][spacether sponsorship]
+   * Python-Experimental: @spacether [:heart:][spacether sponsorship]
   * R: @ramnov
   * Ruby (Faraday): @meganemura @dkliban
   * Rust: @farcaller
@ -960,6 +965,7 @@ Here is a list of template creators:
   * GraphQL Express Server: @renepardon
   * Haskell Servant: @algas
   * Haskell Yesod: @yotsuya
+   * Java Camel: @carnevalegiacomo
   * Java MSF4J: @sanjeewa-malalgoda
   * Java Spring Boot: @diyfr
   * Java Undertow: @stevehu
@ -1046,6 +1052,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | 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)                                                                               |
 | 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)                                                                                                      |
 | Eiffel            | @jvelilla (2017/09)                                                                                                                                                                                                               |
 | Elixir            | @mrmstn (2018/12)                                                                                                                                                                                                                 |
@ -1067,7 +1074,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Perl              | @wing328 (2017/07) [:heart:](https://www.patreon.com/wing328) @yue9944882 (2019/06)                                                                                                                                               |
 | PHP               | @jebentier (2017/07), @dkarlovi (2017/07), @mandrean (2017/08), @jfastnacht (2017/09), @ackintosh (2017/09) [:heart:](https://www.patreon.com/ackintosh/overview), @ybelenko (2018/07), @renepardon (2018/12)                     |
 | PowerShell        | @wing328 (2020/05)                                                                                                                                                                                                                                  |
-| Python            | @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11) @tomplus (2018/10) @Jyhess (2019/01) @arun-nalla (2019/11) @spacether (2019/11)                                                |
+| Python            | @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11) @tomplus (2018/10) @Jyhess (2019/01) @arun-nalla (2019/11) @spacether (2019/11) [:heart:][spacether sponsorship]               |
 | 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)                                                                                                                               |
--- a/bin/configs/other/avro-schema.yaml
+++ b/bin/configs/other/avro-schema.yaml
--- a/bin/configs/csharp-netcore-OpenAPIClientCore.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClientCore.yaml
@ -4,5 +4,5 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-f
 templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
 additionalProperties:
  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  targetFramework: netcoreapp2.0
+  targetFramework: netcoreapp3.1
  useCompareNetObjects: "true"
--- a/bin/configs/csharp-netcore-OpenAPIClientCoreAndNet47.yaml
+++ b/bin/configs/csharp-netcore-OpenAPIClientCoreAndNet47.yaml
@ -4,5 +4,5 @@ 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;netcoreapp3.0
+  targetFramework: netstandard2.1;net47
  useCompareNetObjects: "true"
--- a/bin/configs/java-camel-petstore-new.yaml
+++ b/bin/configs/java-camel-petstore-new.yaml
@ -0,0 +1,17 @@
+generatorName: java-camel
+outputDir: samples/server/petstore/java-camel
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/java-camel-server
+additionalProperties:
+  oas3: "true"
+  hideGenerationTimestamp: true
+  camelRestBindingMode: "auto"
+  performBeanValidation: true
+  #dateLibrary: "java8-localdatetime"
+  camelDataformatProperties: "json.out.disableFeatures=WRITE_DATES_AS_TIMESTAMPS"
+  library: "spring-boot"
+  withXml: true
+  jackson: true
+  camelUseDefaulValidationtErrorProcessor: true
+  camelRestClientRequestValidation: true
+  camelSecurityDefinitions: true
--- a/bin/configs/java-micronaut-client.yaml
+++ b/bin/configs/java-micronaut-client.yaml
@ -7,3 +7,4 @@ additionalProperties:
  configureAuth: "false"
  build: "all"
  test: "spock"
+  requiredPropertiesInConstructor: "false"
--- a/bin/configs/java-micronaut-server.yaml
+++ b/bin/configs/java-micronaut-server.yaml
@ -0,0 +1,10 @@
+generatorName: java-micronaut-server
+outputDir: samples/server/petstore/java-micronaut-server/
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+additionalProperties:
+  artifactId: petstore-micronaut-server
+  hideGenerationTimestamp: "true"
+  build: "all"
+  test: "spock"
+  requiredPropertiesInConstructor: "true"
+  useAuth: "false"
--- a/bin/configs/kotlin-array-simple-string.yaml
+++ b/bin/configs/kotlin-array-simple-string.yaml
@ -0,0 +1,6 @@
+generatorName: kotlin
+outputDir: samples/client/petstore/kotlin-array-simple-string
+inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_7199_array_simple_string.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+additionalProperties:
+  artifactId: kotlin-array-simple-string
--- a/bin/configs/kotlin-server-jaxrs-spec.yaml
+++ b/bin/configs/kotlin-server-jaxrs-spec.yaml
@ -0,0 +1,7 @@
+generatorName: kotlin-server
+outputDir: samples/server/petstore/kotlin-server/jaxrs-spec
+library: jaxrs-spec
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-server
+additionalProperties:
+  useCoroutines: "true"
--- a/bin/configs/other/csharp-nancyfx-nancyfx-async.yaml
+++ b/bin/configs/other/csharp-nancyfx-nancyfx-async.yaml
@ -1,7 +0,0 @@
-generatorName: csharp-nancyfx
-outputDir: samples/server/petstore/nancyfx-async
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-nancyfx
-additionalProperties:
-  asyncServer: "true"
-  packageGuid: '{768B8DC6-54EE-4D40-9B20-7857E1D742A4}'
--- a/bin/configs/other/csharp-nancyfx-nancyfx.yaml
+++ b/bin/configs/other/csharp-nancyfx-nancyfx.yaml
@ -1,7 +0,0 @@
-generatorName: csharp-nancyfx
-outputDir: samples/server/petstore/nancyfx
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-nancyfx
-additionalProperties:
-  asyncServer: "false"
-  packageGuid: '{768B8DC6-54EE-4D40-9B20-7857E1D742A4}'
--- a/bin/configs/python-experimental.yaml
+++ b/bin/configs/python-experimental.yaml
@ -0,0 +1,7 @@
+generatorName: python-experimental
+outputDir: samples/openapi3/client/petstore/python-experimental
+inputSpec: modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-generator/src/main/resources/python-experimental
+additionalProperties:
+  packageName: petstore_api
+  recursionLimit: "1234"
--- a/bin/configs/spring-boot-beanvalidation-no-nullable-oas3.yaml
+++ b/bin/configs/spring-boot-beanvalidation-no-nullable-oas3.yaml
@ -5,7 +5,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  groupId: org.openapitools.openapi3
-  oas3: "true"
+  documentationProvider: springdoc
  java8: "false"
  useBeanValidation: true
  artifactId: spring-boot-beanvalidation-no-nullable
--- a/bin/configs/spring-boot-beanvalidation-no-nullable.yaml
+++ b/bin/configs/spring-boot-beanvalidation-no-nullable.yaml
@ -4,6 +4,7 @@ library: spring-boot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  java8: "false"
  useBeanValidation: true
  artifactId: spring-boot-beanvalidation-no-nullable
--- a/bin/configs/spring-boot-beanvalidation.yaml
+++ b/bin/configs/spring-boot-beanvalidation.yaml
@ -4,6 +4,7 @@ library: spring-boot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  java8: true
  useBeanValidation: true
  artifactId: spring-boot-beanvalidation
--- a/bin/configs/spring-boot-delegate-j8.yaml
+++ b/bin/configs/spring-boot-delegate-j8.yaml
@ -3,6 +3,7 @@ outputDir: samples/server/petstore/springboot-delegate-j8
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot-delegate-j8
  hideGenerationTimestamp: "true"
  delegatePattern: "true"
--- a/bin/configs/spring-boot-delegate-oas3.yaml
+++ b/bin/configs/spring-boot-delegate-oas3.yaml
@ -4,7 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  groupId: org.openapitools.openapi3
-  oas3: "true"
+  documentationProvider: springdoc
  artifactId: springboot-delegate
  hideGenerationTimestamp: "true"
  java8: true
--- a/bin/configs/spring-boot-delegate.yaml
+++ b/bin/configs/spring-boot-delegate.yaml
@ -3,6 +3,7 @@ outputDir: samples/server/petstore/springboot-delegate
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot-delegate
  hideGenerationTimestamp: "true"
  java8: true
--- a/bin/configs/spring-boot-implicitHeaders-oas3.yaml
+++ b/bin/configs/spring-boot-implicitHeaders-oas3.yaml
@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
  oas3: "true"
  artifactId: springboot-implicitHeaders
  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-implicitHeaders.yaml
+++ b/bin/configs/spring-boot-implicitHeaders.yaml
@ -4,5 +4,6 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  artifactId: springboot-implicitHeaders
+  documentationProvider: springfox
  hideGenerationTimestamp: "true"
  implicitHeaders: true
--- a/bin/configs/spring-boot-oas3.yaml
+++ b/bin/configs/spring-boot-oas3.yaml
@ -4,7 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
  artifactId: springboot
  snapshotVersion: "true"
-  oas3: "true"
  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-reactive-oas3.yaml
+++ b/bin/configs/spring-boot-reactive-oas3.yaml
@ -4,7 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  groupId: org.openapitools.openapi3
-  oas3: "true"
+  documentationProvider: springdoc
  artifactId: springboot-reactive
  reactive: "true"
  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-reactive.yaml
+++ b/bin/configs/spring-boot-reactive.yaml
@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  artifactId: springboot-reactive
+  documentationProvider: springfox
  reactive: "true"
  hideGenerationTimestamp: "true"
  delegatePattern: "true"
--- a/bin/configs/spring-boot-springdoc.yaml
+++ b/bin/configs/spring-boot-springdoc.yaml
@ -0,0 +1,10 @@
+generatorName: spring
+outputDir: samples/openapi3/server/petstore/spring-boot-springdoc
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: spring-boot-springdoc
+  snapshotVersion: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-useoptional-oas3.yaml
+++ b/bin/configs/spring-boot-useoptional-oas3.yaml
@ -4,7 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  groupId: org.openapitools.openapi3
-  oas3: "true"
+  documentationProvider: springdoc
  useOptional: true
  artifactId: spring-boot-useoptional
  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-useoptional.yaml
+++ b/bin/configs/spring-boot-useoptional.yaml
@ -3,6 +3,7 @@ outputDir: samples/server/petstore/springboot-useoptional
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  useOptional: true
  artifactId: spring-boot-useoptional
  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-boot-virtualan.yaml
+++ b/bin/configs/spring-boot-virtualan.yaml
@ -4,6 +4,7 @@ library: spring-boot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  apiPackage: org.openapitools.virtualan.api
  modelPackage: org.openapitools.virtualan.model
  virtualService: true
--- a/bin/configs/spring-boot.yaml
+++ b/bin/configs/spring-boot.yaml
@ -3,6 +3,7 @@ outputDir: samples/server/petstore/springboot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot
  snapshotVersion: "true"
  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-cloud-async-oas3.yaml
+++ b/bin/configs/spring-cloud-async-oas3.yaml
@ -5,7 +5,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  groupId: org.openapitools.openapi3
-  oas3: "true"
+  documentationProvider: springdoc
  async: "true"
  java8: "true"
  artifactId: petstore-spring-cloud
--- a/bin/configs/spring-cloud-async.yaml
+++ b/bin/configs/spring-cloud-async.yaml
@ -4,6 +4,7 @@ library: spring-cloud
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  async: "true"
  java8: "true"
  artifactId: petstore-spring-cloud
--- a/bin/configs/spring-cloud-date-time-oas3.yaml
+++ b/bin/configs/spring-cloud-date-time-oas3.yaml
@ -5,8 +5,8 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/date-time-par
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
  artifactId: spring-cloud-date-time-oas3
  interfaceOnly: "true"
  singleContentTypes: "true"
-  hideGenerationTimestamp: "true"
-  oas3: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-cloud-date-time.yaml
+++ b/bin/configs/spring-cloud-date-time.yaml
@ -4,6 +4,7 @@ outputDir: samples/client/petstore/spring-cloud-date-time
 inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: spring-cloud-date-time
  interfaceOnly: "true"
  singleContentTypes: "true"
--- a/bin/configs/spring-cloud-oas3-fakeapi.yaml
+++ b/bin/configs/spring-cloud-oas3-fakeapi.yaml
@ -5,8 +5,8 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
  artifactId: spring-cloud-oas3
  interfaceOnly: "true"
  singleContentTypes: "true"
  hideGenerationTimestamp: "true"
-  oas3: "true"
--- a/bin/configs/spring-cloud-oas3.yaml
+++ b/bin/configs/spring-cloud-oas3.yaml
@ -5,8 +5,8 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
  artifactId: spring-cloud-oas3
  interfaceOnly: "true"
  singleContentTypes: "true"
  hideGenerationTimestamp: "true"
-  oas3: "true"
--- a/bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml
+++ b/bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml
@ -5,6 +5,6 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  groupId: org.openapitools.openapi3
-  oas3: "true"
+  documentationProvider: springdoc
  artifactId: spring-cloud-spring-pageable
  hideGenerationTimestamp: 'true'
--- a/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml
+++ b/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml
@ -4,5 +4,6 @@ library: spring-cloud
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: spring-cloud-spring-pageable
  hideGenerationTimestamp: 'true'
--- a/bin/configs/spring-cloud.yaml
+++ b/bin/configs/spring-cloud.yaml
@ -4,5 +4,6 @@ library: spring-cloud
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: petstore-spring-cloud
  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-mvc-default-values.yaml
+++ b/bin/configs/spring-mvc-default-values.yaml
@ -3,5 +3,6 @@ outputDir: samples/server/petstore/spring-mvc-default-value
 inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_8535.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  hideGenerationTimestamp: "true"
  artifactId: spring-mvc-default-value
--- a/bin/configs/spring-mvc-j8-async.yaml
+++ b/bin/configs/spring-mvc-j8-async.yaml
@ -4,6 +4,7 @@ library: spring-mvc
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  async: "true"
  java8: true
  artifactId: spring-mvc-server-j8-async
--- a/bin/configs/spring-mvc-j8-localdatetime.yaml
+++ b/bin/configs/spring-mvc-j8-localdatetime.yaml
@ -4,6 +4,7 @@ library: spring-mvc
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  booleanGetterPrefix: get
  artifactId: spring-mvc-j8-localdatetime
  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-mvc-no-nullable.yaml
+++ b/bin/configs/spring-mvc-no-nullable.yaml
@ -4,6 +4,7 @@ library: spring-mvc
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: spring-mvc-server-no-nullable
  openApiNullable: "false"
  serverPort: "8002"
--- a/bin/configs/spring-mvc-petstore-server-spring-pageable.yaml
+++ b/bin/configs/spring-mvc-petstore-server-spring-pageable.yaml
@ -4,5 +4,6 @@ library: spring-mvc
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: spring-mvc-spring-pageable
  hideGenerationTimestamp: 'true'
--- a/bin/configs/spring-mvc.yaml
+++ b/bin/configs/spring-mvc.yaml
@ -4,6 +4,7 @@ library: spring-mvc
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  java8: true
  booleanGetterPrefix: get
  artifactId: spring-mvc-server
--- a/bin/configs/spring-stubs-oas3.yaml
+++ b/bin/configs/spring-stubs-oas3.yaml
@ -0,0 +1,11 @@
+generatorName: spring
+outputDir: samples/openapi3/client/petstore/spring-stubs
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: spring-stubs
+  interfaceOnly: "true"
+  singleContentTypes: "true"
+  hideGenerationTimestamp: "true"
--- a/bin/configs/spring-stubs.yaml
+++ b/bin/configs/spring-stubs.yaml
@ -3,6 +3,7 @@ outputDir: samples/client/petstore/spring-stubs
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: spring-stubs
  interfaceOnly: "true"
  singleContentTypes: "true"
--- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml
+++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml
@ -6,5 +6,6 @@ templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 delegatePattern: true
 java8: false
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot-spring-pageable-delegatePattern-without-j8
  hideGenerationTimestamp: 'true'
--- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml
+++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml
@ -5,5 +5,6 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 delegatePattern: true
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot-spring-pageable-delegatePattern
  hideGenerationTimestamp: 'true'
--- a/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml
+++ b/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml
@ -5,5 +5,6 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-e
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 java8: false
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot-spring-pageable-withoutj8
  hideGenerationTimestamp: 'true'
--- a/bin/configs/springboot-petstore-server-spring-pageable.yaml
+++ b/bin/configs/springboot-petstore-server-spring-pageable.yaml
@ -4,5 +4,6 @@ library: spring-boot
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
+  documentationProvider: springfox
  artifactId: springboot-spring-pageable
  hideGenerationTimestamp: 'true'
--- a/bin/configs/typescript-axios-with-string-enums.yaml
+++ b/bin/configs/typescript-axios-with-string-enums.yaml
@ -0,0 +1,6 @@
+generatorName: typescript-axios
+outputDir: samples/client/petstore/typescript-axios/builds/with-string-enums
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+additionalProperties:
+  stringEnums: true
--- a/docs/configuration.md
+++ b/docs/configuration.md
@ -36,7 +36,7 @@ _How_ you provide values to options also depends on the tool. OpenAPI Generator
 openApiGenerate {
    globalProperties = [
        apis: "",
-        models: "User,Pet"
+        models: "User:Pet"
    ]
 }
 ```
--- a/docs/generators.md
+++ b/docs/generators.md
@ -51,7 +51,8 @@ The following generators are available:
 * [php](generators/php.md)  
 * [php-dt (beta)](generators/php-dt.md)  
 * [powershell (beta)](generators/powershell.md)  
-* [python (experimental)](generators/python.md)  
+* [python](generators/python.md)  
+* [python-experimental (experimental)](generators/python-experimental.md)  
 * [python-legacy](generators/python-legacy.md)  
 * [r](generators/r.md)  
 * [ruby](generators/ruby.md)  
@ -61,7 +62,6 @@ The following generators are available:
 * [scala-httpclient-deprecated (deprecated)](generators/scala-httpclient-deprecated.md)  
 * [scala-sttp (beta)](generators/scala-sttp.md)  
 * [scalaz](generators/scalaz.md)  
-* [swift4-deprecated (deprecated)](generators/swift4-deprecated.md)  
 * [swift5](generators/swift5.md)  
 * [typescript (experimental)](generators/typescript.md)  
 * [typescript-angular](generators/typescript-angular.md)  
@ -82,7 +82,7 @@ The following generators are available:
 * [cpp-pistache-server](generators/cpp-pistache-server.md)  
 * [cpp-qt-qhttpengine-server](generators/cpp-qt-qhttpengine-server.md)  
 * [cpp-restbed-server](generators/cpp-restbed-server.md)  
-* [csharp-nancyfx](generators/csharp-nancyfx.md)  
+* [csharp-nancyfx-deprecated (deprecated)](generators/csharp-nancyfx-deprecated.md)  
 * [csharp-netcore-functions (beta)](generators/csharp-netcore-functions.md)  
 * [erlang-server](generators/erlang-server.md)  
 * [fsharp-functions (beta)](generators/fsharp-functions.md)  
@ -93,7 +93,9 @@ The following generators are available:
 * [graphql-nodejs-express-server](generators/graphql-nodejs-express-server.md)  
 * [haskell](generators/haskell.md)  
 * [haskell-yesod (beta)](generators/haskell-yesod.md)  
+* [java-camel](generators/java-camel.md)  
 * [java-inflector](generators/java-inflector.md)  
+* [java-micronaut-server (beta)](generators/java-micronaut-server.md)  
 * [java-msf4j](generators/java-msf4j.md)  
 * [java-pkmst](generators/java-pkmst.md)  
 * [java-play-framework](generators/java-play-framework.md)  
--- a/docs/generators/ada-server.md
+++ b/docs/generators/ada-server.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for ada-server
-sidebar_label: ada-server
+title: Documentation for the ada-server Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | ada-server | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | SERVER | |
+| generator language | Ada | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates an Ada server implementation (beta). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/ada.md
+++ b/docs/generators/ada.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for ada
-sidebar_label: ada
+title: Documentation for the ada Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | ada | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | Ada | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates an Ada client implementation (beta). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/android.md
+++ b/docs/generators/android.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for android
-sidebar_label: android
+title: Documentation for the android Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | android | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | Java | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates an Android client library. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/apache2.md
+++ b/docs/generators/apache2.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for apache2
-sidebar_label: apache2
+title: Documentation for the apache2 Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | apache2 | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CONFIG | |
+| generator language | Java | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates an Apache2 Config file with the permissions | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/apex.md
+++ b/docs/generators/apex.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for apex
-sidebar_label: apex
+title: Documentation for the apex Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | apex | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | Apex | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates an Apex API client library. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/asciidoc.md
+++ b/docs/generators/asciidoc.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for asciidoc
-sidebar_label: asciidoc
+title: Documentation for the asciidoc Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | asciidoc | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | DOCUMENTATION | |
+| generator language | Java | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates asciidoc markup based documentation. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/aspnetcore.md
+++ b/docs/generators/aspnetcore.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for aspnetcore
-sidebar_label: aspnetcore
+title: Documentation for the aspnetcore Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | aspnetcore | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | SERVER | |
+| generator language | C# | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates an ASP.NET Core Web API server. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
@ -19,7 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |licenseUrl|The URL of the license| |http://localhost|
 |modelClassModifier|Model Class Modifier can be nothing or partial| |partial|
 |newtonsoftVersion|Version for Microsoft.AspNetCore.Mvc.NewtonsoftJson for ASP.NET Core 3.0+| |3.0.0|
-|nullableReferenceTypes|Use nullable annotations in the project. Only supported on C# 8 / ASP.NET Core 3.0 or newer.| |false|
+|nullableReferenceTypes|Use nullable annotations in the project. Only supported on C# 8 / ASP.NET Core 3.1 or newer.| |false|
 |operationIsAsync|Set methods to async or sync (default).| |false|
 |operationModifier|Operation Modifier can be virtual or abstract|<dl><dt>**virtual**</dt><dd>Keep method virtual</dd><dt>**abstract**</dt><dd>Make method abstract</dd></dl>|virtual|
 |operationResultTask|Set methods result to Task&lt;&gt;.| |false|
--- a/docs/generators/avro-schema.md
+++ b/docs/generators/avro-schema.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for avro-schema
-sidebar_label: avro-schema
+title: Documentation for the avro-schema Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | avro-schema | pass this to the generate command after -g |
+| generator stability | BETA | |
+| generator type | SCHEMA | |
+| generator language | Java | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Avro model (beta). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/bash.md
+++ b/docs/generators/bash.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for bash
-sidebar_label: bash
+title: Documentation for the bash Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | bash | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | Bash | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Bash client script based on cURL. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/c.md
+++ b/docs/generators/c.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for c
-sidebar_label: c
+title: Documentation for the c Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | c | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | C | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a C (libcurl) client library (beta). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/clojure.md
+++ b/docs/generators/clojure.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for clojure
-sidebar_label: clojure
+title: Documentation for the clojure Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | clojure | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | Clojure | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Clojure client library. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/cpp-pistache-server.md
+++ b/docs/generators/cpp-pistache-server.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for cpp-pistache-server
-sidebar_label: cpp-pistache-server
+title: Documentation for the cpp-pistache-server Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | cpp-pistache-server | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | SERVER | |
+| generator language | C++ | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a C++ API server (based on Pistache) | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/cpp-qt-client.md
+++ b/docs/generators/cpp-qt-client.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for cpp-qt-client
-sidebar_label: cpp-qt-client
+title: Documentation for the cpp-qt-client Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | cpp-qt-client | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | C++ | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Qt C++ client library. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/cpp-qt-qhttpengine-server.md
+++ b/docs/generators/cpp-qt-qhttpengine-server.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for cpp-qt-qhttpengine-server
-sidebar_label: cpp-qt-qhttpengine-server
+title: Documentation for the cpp-qt-qhttpengine-server Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | cpp-qt-qhttpengine-server | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | SERVER | |
+| generator language | C++ | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Qt C++ Server using the QHTTPEngine HTTP Library. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/cpp-restbed-server.md
+++ b/docs/generators/cpp-restbed-server.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for cpp-restbed-server
-sidebar_label: cpp-restbed-server
+title: Documentation for the cpp-restbed-server Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | cpp-restbed-server | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | SERVER | |
+| generator language | C++ | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a C++ API Server with Restbed (https://github.com/Corvusoft/restbed). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/cpp-restsdk.md
+++ b/docs/generators/cpp-restsdk.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for cpp-restsdk
-sidebar_label: cpp-restsdk
+title: Documentation for the cpp-restsdk Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | cpp-restsdk | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | C++ | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a C++ API client with C++ REST SDK (https://github.com/Microsoft/cpprestsdk). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/cpp-tiny.md
+++ b/docs/generators/cpp-tiny.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for cpp-tiny
-sidebar_label: cpp-tiny
+title: Documentation for the cpp-tiny Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | cpp-tiny | pass this to the generate command after -g |
+| generator stability | BETA | |
+| generator type | CLIENT | |
+| generator language | C++ | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a C++ Arduino REST API client. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/cpp-tizen.md
+++ b/docs/generators/cpp-tizen.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for cpp-tizen
-sidebar_label: cpp-tizen
+title: Documentation for the cpp-tizen Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | cpp-tizen | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | C++ | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Samsung Tizen C++ client library. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/cpp-ue4.md
+++ b/docs/generators/cpp-ue4.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for cpp-ue4
-sidebar_label: cpp-ue4
+title: Documentation for the cpp-ue4 Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | cpp-ue4 | pass this to the generate command after -g |
+| generator stability | BETA | |
+| generator type | CLIENT | |
+| generator language | C++ | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Unreal Engine 4 C++ Module (beta). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/crystal.md
+++ b/docs/generators/crystal.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for crystal
-sidebar_label: crystal
+title: Documentation for the crystal Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | crystal | pass this to the generate command after -g |
+| generator stability | BETA | |
+| generator type | CLIENT | |
+| generator language | Crystal | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Crystal client library (beta). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/csharp-dotnet2.md
+++ b/docs/generators/csharp-dotnet2.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for csharp-dotnet2
-sidebar_label: csharp-dotnet2
+title: Documentation for the csharp-dotnet2 Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | csharp-dotnet2 | pass this to the generate command after -g |
+| generator stability | DEPRECATED | |
+| generator type | CLIENT | |
+| generator language | C# | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a C# .Net 2.0 client library (beta). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/csharp-nancyfx-deprecated.md
+++ b/docs/generators/csharp-nancyfx-deprecated.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for csharp-nancyfx
-sidebar_label: csharp-nancyfx
+title: Documentation for the csharp-nancyfx-deprecated Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | csharp-nancyfx-deprecated | pass this to the generate command after -g |
+| generator stability | DEPRECATED | |
+| generator type | SERVER | |
+| generator language | C# | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a C# NancyFX Web API server (deprecated). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/csharp-netcore-functions.md
+++ b/docs/generators/csharp-netcore-functions.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for csharp-netcore-functions
-sidebar_label: csharp-netcore-functions
+title: Documentation for the csharp-netcore-functions Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | csharp-netcore-functions | pass this to the generate command after -g |
+| generator stability | BETA | |
+| generator type | SERVER | |
+| generator language | C# | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a csharp server. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
@ -18,7 +29,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |PascalCase|
 |netCoreProjectFile|Use the new format (.NET Core) for .NET project files (.csproj).| |false|
 |nonPublicApi|Generates code with reduced access modifiers; allows embedding elsewhere without exposing non-public API calls to consumers.| |false|
-|nullableReferenceTypes|Use nullable annotations in the project. Only supported on C# 8 / ASP.NET Core 3.0 or newer.| |false|
+|nullableReferenceTypes|Use nullable annotations in the project. Only supported on C# 8 / ASP.NET Core 3.1 or newer.| |false|
 |optionalAssemblyInfo|Generate AssemblyInfo.cs.| |true|
 |optionalEmitDefaultValues|Set DataMember's EmitDefaultValue.| |false|
 |optionalMethodArgument|C# Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).| |true|
@ -31,7 +42,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |returnICollection|Return ICollection&lt;T&gt; instead of the concrete type.| |false|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
 |sourceFolder|source folder for generated code| |src|
-|targetFramework|The target .NET framework version. To target multiple frameworks, use `;` as the separator, e.g. `netstandard2.1;netcoreapp3.0`|<dl><dt>**netstandard1.3**</dt><dd>.NET Standard 1.3 compatible</dd><dt>**netstandard1.4**</dt><dd>.NET Standard 1.4 compatible</dd><dt>**netstandard1.5**</dt><dd>.NET Standard 1.5 compatible</dd><dt>**netstandard1.6**</dt><dd>.NET Standard 1.6 compatible</dd><dt>**netstandard2.0**</dt><dd>.NET Standard 2.0 compatible</dd><dt>**netstandard2.1**</dt><dd>.NET Standard 2.1 compatible</dd><dt>**netcoreapp2.0**</dt><dd>.NET Core 2.0 compatible</dd><dt>**netcoreapp2.1**</dt><dd>.NET Core 2.1 compatible</dd><dt>**netcoreapp3.0**</dt><dd>.NET Core 3.0 compatible</dd><dt>**netcoreapp3.1**</dt><dd>.NET Core 3.1 compatible</dd><dt>**net47**</dt><dd>.NET Framework 4.7 compatible</dd><dt>**net5.0**</dt><dd>.NET 5.0 compatible</dd></dl>|netstandard2.0|
+|targetFramework|The target .NET framework version. To target multiple frameworks, use `;` as the separator, e.g. `netstandard2.1;netcoreapp3.1`|<dl><dt>**netstandard1.3**</dt><dd>.NET Standard 1.3 compatible</dd><dt>**netstandard1.4**</dt><dd>.NET Standard 1.4 compatible</dd><dt>**netstandard1.5**</dt><dd>.NET Standard 1.5 compatible</dd><dt>**netstandard1.6**</dt><dd>.NET Standard 1.6 compatible</dd><dt>**netstandard2.0**</dt><dd>.NET Standard 2.0 compatible</dd><dt>**netstandard2.1**</dt><dd>.NET Standard 2.1 compatible</dd><dt>**netcoreapp2.0**</dt><dd>.NET Core 2.0 compatible</dd><dt>**netcoreapp2.1**</dt><dd>.NET Core 2.1 compatible</dd><dt>**netcoreapp3.0**</dt><dd>.NET Core 3.0 compatible</dd><dt>**netcoreapp3.1**</dt><dd>.NET Core 3.1 compatible</dd><dt>**net47**</dt><dd>.NET Framework 4.7 compatible</dd><dt>**net5.0**</dt><dd>.NET 5.0 compatible</dd></dl>|netstandard2.0|
 |useCollection|Deserialize array types to Collection&lt;T&gt; instead of List&lt;T&gt;.| |false|
 |useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
 |useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped.| |false|
--- a/docs/generators/csharp-netcore.md
+++ b/docs/generators/csharp-netcore.md
@ -1,24 +1,36 @@
 ---
-title: Config Options for csharp-netcore
-sidebar_label: csharp-netcore
+title: Documentation for the csharp-netcore Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | csharp-netcore | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | C# | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a C# client library (.NET Standard, .NET Core). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|apiName|Must be a valid C# class name. Only used in Generic Host library. Default: Api| |Api|
 |caseInsensitiveResponseHeaders|Make API response's headers case-insensitive| |false|
 |conditionalSerialization|Serialize only those properties which are initialized by user, accepted values are true or false, default value is false.| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I|
-|library|HTTP library template (sub-template) to use|<dl><dt>**httpclient**</dt><dd>HttpClient (https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) (Experimental. May subject to breaking changes without further notice.)</dd><dt>**restsharp**</dt><dd>RestSharp (https://github.com/restsharp/RestSharp)</dd></dl>|restsharp|
+|library|HTTP library template (sub-template) to use|<dl><dt>**generichost**</dt><dd>HttpClient with Generic Host dependency injection (https://docs.microsoft.com/en-us/dotnet/core/extensions/generic-host) (Experimental. Subject to breaking changes without notice.)</dd><dt>**httpclient**</dt><dd>HttpClient (https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) (Experimental. Subject to breaking changes without notice.)</dd><dt>**restsharp**</dt><dd>RestSharp (https://github.com/restsharp/RestSharp)</dd></dl>|restsharp|
 |licenseId|The identifier of the license| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |PascalCase|
 |netCoreProjectFile|Use the new format (.NET Core) for .NET project files (.csproj).| |false|
 |nonPublicApi|Generates code with reduced access modifiers; allows embedding elsewhere without exposing non-public API calls to consumers.| |false|
-|nullableReferenceTypes|Use nullable annotations in the project. Only supported on C# 8 / ASP.NET Core 3.0 or newer.| |false|
+|nullableReferenceTypes|Use nullable annotations in the project. Only supported on C# 8 / ASP.NET Core 3.1 or newer.| |false|
 |optionalAssemblyInfo|Generate AssemblyInfo.cs.| |true|
 |optionalEmitDefaultValues|Set DataMember's EmitDefaultValue.| |false|
 |optionalMethodArgument|C# Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).| |true|
@ -31,7 +43,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |returnICollection|Return ICollection&lt;T&gt; instead of the concrete type.| |false|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
 |sourceFolder|source folder for generated code| |src|
-|targetFramework|The target .NET framework version. To target multiple frameworks, use `;` as the separator, e.g. `netstandard2.1;netcoreapp3.0`|<dl><dt>**netstandard1.3**</dt><dd>.NET Standard 1.3 compatible</dd><dt>**netstandard1.4**</dt><dd>.NET Standard 1.4 compatible</dd><dt>**netstandard1.5**</dt><dd>.NET Standard 1.5 compatible</dd><dt>**netstandard1.6**</dt><dd>.NET Standard 1.6 compatible</dd><dt>**netstandard2.0**</dt><dd>.NET Standard 2.0 compatible</dd><dt>**netstandard2.1**</dt><dd>.NET Standard 2.1 compatible</dd><dt>**netcoreapp2.0**</dt><dd>.NET Core 2.0 compatible</dd><dt>**netcoreapp2.1**</dt><dd>.NET Core 2.1 compatible</dd><dt>**netcoreapp3.0**</dt><dd>.NET Core 3.0 compatible</dd><dt>**netcoreapp3.1**</dt><dd>.NET Core 3.1 compatible</dd><dt>**net47**</dt><dd>.NET Framework 4.7 compatible</dd><dt>**net5.0**</dt><dd>.NET 5.0 compatible</dd><dt>**net6.0**</dt><dd>.NET 6.0 compatible</dd></dl>|netstandard2.0|
+|targetFramework|The target .NET framework version. To target multiple frameworks, use `;` as the separator, e.g. `netstandard2.1;netcoreapp3.1`|<dl><dt>**netstandard1.3**</dt><dd>.NET Standard 1.3 compatible</dd><dt>**netstandard1.4**</dt><dd>.NET Standard 1.4 compatible</dd><dt>**netstandard1.5**</dt><dd>.NET Standard 1.5 compatible</dd><dt>**netstandard1.6**</dt><dd>.NET Standard 1.6 compatible</dd><dt>**netstandard2.0**</dt><dd>.NET Standard 2.0 compatible</dd><dt>**netstandard2.1**</dt><dd>.NET Standard 2.1 compatible</dd><dt>**netcoreapp2.0**</dt><dd>.NET Core 2.0 compatible (deprecated)</dd><dt>**netcoreapp2.1**</dt><dd>.NET Core 2.1 compatible (deprecated)</dd><dt>**netcoreapp3.0**</dt><dd>.NET Core 3.0 compatible (deprecated)</dd><dt>**netcoreapp3.1**</dt><dd>.NET Core 3.1 compatible</dd><dt>**net47**</dt><dd>.NET Framework 4.7 compatible</dd><dt>**net5.0**</dt><dd>.NET 5.0 compatible</dd><dt>**net6.0**</dt><dd>.NET 6.0 compatible</dd></dl>|netstandard2.0|
 |useCollection|Deserialize array types to Collection&lt;T&gt; instead of List&lt;T&gt;.| |false|
 |useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
 |useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped.| |false|
--- a/docs/generators/csharp.md
+++ b/docs/generators/csharp.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for csharp
-sidebar_label: csharp
+title: Documentation for the csharp Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | csharp | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | C# | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a CSharp client library. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
@ -25,7 +36,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |returnICollection|Return ICollection&lt;T&gt; instead of the concrete type.| |false|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
 |sourceFolder|source folder for generated code| |src|
-|targetFramework|The target .NET framework version. To target multiple frameworks, use `;` as the separator, e.g. `netstandard2.1;netcoreapp3.0`|<dl><dt>**v3.5**</dt><dd>.NET Framework 3.5 compatible</dd><dt>**v4.0**</dt><dd>.NET Framework 4.0 compatible</dd><dt>**v4.5**</dt><dd>.NET Framework 4.5 compatible</dd><dt>**v4.5.2**</dt><dd>.NET Framework 4.5.2+ compatible</dd><dt>**netstandard1.3**</dt><dd>.NET Standard 1.3 compatible (DEPRECATED. Please use `csharp-netcore` generator instead)</dd><dt>**uwp**</dt><dd>Universal Windows Platform (DEPRECATED. Please use `csharp-netcore` generator instead)</dd></dl>|v4.5|
+|targetFramework|The target .NET framework version. To target multiple frameworks, use `;` as the separator, e.g. `netstandard2.1;netcoreapp3.1`|<dl><dt>**v3.5**</dt><dd>.NET Framework 3.5 compatible</dd><dt>**v4.0**</dt><dd>.NET Framework 4.0 compatible</dd><dt>**v4.5**</dt><dd>.NET Framework 4.5 compatible</dd><dt>**v4.5.2**</dt><dd>.NET Framework 4.5.2+ compatible</dd><dt>**netstandard1.3**</dt><dd>.NET Standard 1.3 compatible (DEPRECATED. Please use `csharp-netcore` generator instead)</dd><dt>**uwp**</dt><dd>Universal Windows Platform (DEPRECATED. Please use `csharp-netcore` generator instead)</dd></dl>|v4.5|
 |useCollection|Deserialize array types to Collection&lt;T&gt; instead of List&lt;T&gt;.| |false|
 |useCompareNetObjects|Use KellermanSoftware.CompareNetObjects for deep recursive object comparison. WARNING: this option incurs potential performance impact.| |false|
 |useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
--- a/docs/generators/cwiki.md
+++ b/docs/generators/cwiki.md
@ -1,8 +1,18 @@
 ---
-title: Config Options for cwiki
-sidebar_label: cwiki
+title: Documentation for the cwiki Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | cwiki | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | DOCUMENTATION | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates confluence wiki markup. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/dart-dio-next.md
+++ b/docs/generators/dart-dio-next.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for dart-dio-next
-sidebar_label: dart-dio-next
+title: Documentation for the dart-dio-next Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | dart-dio-next | pass this to the generate command after -g |
+| generator stability | EXPERIMENTAL | |
+| generator type | CLIENT | |
+| generator language | Dart | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Dart Dio client library with null-safety. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/dart-dio.md
+++ b/docs/generators/dart-dio.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for dart-dio
-sidebar_label: dart-dio
+title: Documentation for the dart-dio Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | dart-dio | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | Dart | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Dart Dio client library. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/dart-jaguar.md
+++ b/docs/generators/dart-jaguar.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for dart-jaguar
-sidebar_label: dart-jaguar
+title: Documentation for the dart-jaguar Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | dart-jaguar | pass this to the generate command after -g |
+| generator stability | DEPRECATED | |
+| generator type | CLIENT | |
+| generator language | Dart | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Dart Jaguar client library. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/dart.md
+++ b/docs/generators/dart.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for dart
-sidebar_label: dart
+title: Documentation for the dart Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | dart | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | Dart | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Dart 2.x client library. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/dynamic-html.md
+++ b/docs/generators/dynamic-html.md
@ -1,8 +1,18 @@
 ---
-title: Config Options for dynamic-html
-sidebar_label: dynamic-html
+title: Documentation for the dynamic-html Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | dynamic-html | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | DOCUMENTATION | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a dynamic HTML site. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/eiffel.md
+++ b/docs/generators/eiffel.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for eiffel
-sidebar_label: eiffel
+title: Documentation for the eiffel Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | eiffel | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | Eiffel | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Eiffel client library (beta). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/elixir.md
+++ b/docs/generators/elixir.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for elixir
-sidebar_label: elixir
+title: Documentation for the elixir Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | elixir | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | Elixir | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates an elixir client library (alpha). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/elm.md
+++ b/docs/generators/elm.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for elm
-sidebar_label: elm
+title: Documentation for the elm Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | elm | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | Elm | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates an Elm client library. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/erlang-client.md
+++ b/docs/generators/erlang-client.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for erlang-client
-sidebar_label: erlang-client
+title: Documentation for the erlang-client Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | erlang-client | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | Erlang | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates an Erlang client library (beta). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/erlang-proper.md
+++ b/docs/generators/erlang-proper.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for erlang-proper
-sidebar_label: erlang-proper
+title: Documentation for the erlang-proper Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | erlang-proper | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | CLIENT | |
+| generator language | Erlang | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates an Erlang library with PropEr generators (beta). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/erlang-server.md
+++ b/docs/generators/erlang-server.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for erlang-server
-sidebar_label: erlang-server
+title: Documentation for the erlang-server Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | erlang-server | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | SERVER | |
+| generator language | Erlang | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates an Erlang server library (beta) using OpenAPI Generator (https://openapi-generator.tech). By default, it will also generate service classes, which can be disabled with the `-Dnoservice` environment variable. | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/docs/generators/flash-deprecated.md
+++ b/docs/generators/flash-deprecated.md
@ -0,0 +1,193 @@
+---
+title: Documentation for the flash-deprecated Generator
+---
+
+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | flash-deprecated | pass this to the generate command after -g |
+| generator stability | DEPRECATED | |
+| generator type | CLIENT | |
+| generator language | Flash | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Flash (ActionScript) client library (beta). IMPORTANT: this generator has been deprecated in v5.x | |
+
+## CONFIG OPTIONS
+These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.
+
+| Option | Description | Values | Default |
+| ------ | ----------- | ------ | ------- |
+|invokerPackage|root package for generated code| |null|
+|packageName|flash package name (convention: package.name)| |org.openapitools|
+|packageVersion|flash package version| |1.0.0|
+|sourceFolder|source folder for generated code. e.g. flash| |null|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|File|flash.filesystem.File|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+<ul class="column-ul">
+<li>Array</li>
+<li>Boolean</li>
+<li>Date</li>
+<li>Dictionary</li>
+<li>Number</li>
+<li>String</li>
+</ul>
+
+## RESERVED WORDS
+
+<ul class="column-ul">
+<li>add</li>
+<li>and</li>
+<li>break</li>
+<li>continue</li>
+<li>delete</li>
+<li>do</li>
+<li>else</li>
+<li>eq</li>
+<li>for</li>
+<li>function</li>
+<li>ge</li>
+<li>gt</li>
+<li>if</li>
+<li>ifframeloaded</li>
+<li>in</li>
+<li>le</li>
+<li>lt</li>
+<li>ne</li>
+<li>new</li>
+<li>not</li>
+<li>on</li>
+<li>onclipevent</li>
+<li>or</li>
+<li>return</li>
+<li>telltarget</li>
+<li>this</li>
+<li>typeof</li>
+<li>var</li>
+<li>void</li>
+<li>while</li>
+<li>with</li>
+</ul>
+
+## FEATURE SET
+
+
+### Client Modification Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|BasePath|✓|ToolingExtension
+|Authorizations|✗|ToolingExtension
+|UserAgent|✗|ToolingExtension
+|MockServer|✗|ToolingExtension
+
+### Data Type Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Custom|✗|OAS2,OAS3
+|Int32|✓|OAS2,OAS3
+|Int64|✓|OAS2,OAS3
+|Float|✓|OAS2,OAS3
+|Double|✓|OAS2,OAS3
+|Decimal|✓|ToolingExtension
+|String|✓|OAS2,OAS3
+|Byte|✓|OAS2,OAS3
+|Binary|✓|OAS2,OAS3
+|Boolean|✓|OAS2,OAS3
+|Date|✓|OAS2,OAS3
+|DateTime|✓|OAS2,OAS3
+|Password|✓|OAS2,OAS3
+|File|✓|OAS2
+|Array|✓|OAS2,OAS3
+|Maps|✓|ToolingExtension
+|CollectionFormat|✓|OAS2
+|CollectionFormatMulti|✓|OAS2
+|Enum|✓|OAS2,OAS3
+|ArrayOfEnum|✓|ToolingExtension
+|ArrayOfModel|✓|ToolingExtension
+|ArrayOfCollectionOfPrimitives|✓|ToolingExtension
+|ArrayOfCollectionOfModel|✓|ToolingExtension
+|ArrayOfCollectionOfEnum|✓|ToolingExtension
+|MapOfEnum|✓|ToolingExtension
+|MapOfModel|✓|ToolingExtension
+|MapOfCollectionOfPrimitives|✓|ToolingExtension
+|MapOfCollectionOfModel|✓|ToolingExtension
+|MapOfCollectionOfEnum|✓|ToolingExtension
+
+### Documentation Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Readme|✓|ToolingExtension
+|Model|✓|ToolingExtension
+|Api|✓|ToolingExtension
+
+### Global Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Host|✓|OAS2,OAS3
+|BasePath|✓|OAS2,OAS3
+|Info|✓|OAS2,OAS3
+|Schemes|✗|OAS2,OAS3
+|PartialSchemes|✓|OAS2,OAS3
+|Consumes|✓|OAS2
+|Produces|✓|OAS2
+|ExternalDocumentation|✓|OAS2,OAS3
+|Examples|✓|OAS2,OAS3
+|XMLStructureDefinitions|✗|OAS2,OAS3
+|MultiServer|✗|OAS3
+|ParameterizedServer|✗|OAS3
+|ParameterStyling|✗|OAS3
+|Callbacks|✗|OAS3
+|LinkObjects|✗|OAS3
+
+### Parameter Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Path|✓|OAS2,OAS3
+|Query|✓|OAS2,OAS3
+|Header|✓|OAS2,OAS3
+|Body|✓|OAS2
+|FormUnencoded|✓|OAS2
+|FormMultipart|✓|OAS2
+|Cookie|✗|OAS3
+
+### Schema Support Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Simple|✓|OAS2,OAS3
+|Composite|✓|OAS2,OAS3
+|Polymorphism|✗|OAS2,OAS3
+|Union|✗|OAS3
+
+### Security Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|BasicAuth|✗|OAS2,OAS3
+|ApiKey|✓|OAS2,OAS3
+|OpenIDConnect|✗|OAS3
+|BearerToken|✗|OAS3
+|OAuth2_Implicit|✗|OAS2,OAS3
+|OAuth2_Password|✗|OAS2,OAS3
+|OAuth2_ClientCredentials|✗|OAS2,OAS3
+|OAuth2_AuthorizationCode|✗|OAS2,OAS3
+
+### Wire Format Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|JSON|✓|OAS2,OAS3
+|XML|✓|OAS2,OAS3
+|PROTOBUF|✗|ToolingExtension
+|Custom|✗|OAS2,OAS3
--- a/docs/generators/fsharp-functions.md
+++ b/docs/generators/fsharp-functions.md
@ -1,8 +1,19 @@
 ---
-title: Config Options for fsharp-functions
-sidebar_label: fsharp-functions
+title: Documentation for the fsharp-functions Generator
 ---

+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | fsharp-functions | pass this to the generate command after -g |
+| generator stability | BETA | |
+| generator type | SERVER | |
+| generator language | F# | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a fsharp-functions server (beta). | |
+
+## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

 | Option | Description | Values | Default |
--- a/Show More
+++ b/Show More